diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:02 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:02 +0900 |
| commit | 93ac820df58de3b16e82fc3b9ff7437e66b2977d (patch) | |
| tree | 96cf756de8d66b025216431f4f28b4a25fccd5f1 /arch/arm/mach-at91/at91sam9263_devices.c | |
| parent | daa5ab9e0d20ab5c07a5f016fa0577ad66da546e (diff) | |
| parent | 3951e4aae2ce7e4593e575e91cbb22f1ba153596 (diff) | |
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
Diffstat (limited to 'arch/arm/mach-at91/at91sam9263_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9263_devices.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index 9c61e59a210..8215839f2d5 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c @@ -1199,7 +1199,7 @@ static struct resource ssc0_resources[] = { }; static struct platform_device at91sam9263_ssc0_device = { - .name = "ssc", + .name = "at91rm9200_ssc", .id = 0, .dev = { .dma_mask = &ssc0_dmamask, @@ -1241,7 +1241,7 @@ static struct resource ssc1_resources[] = { }; static struct platform_device at91sam9263_ssc1_device = { - .name = "ssc", + .name = "at91rm9200_ssc", .id = 1, .dev = { .dma_mask = &ssc1_dmamask, |