diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 13:34:58 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 13:34:58 +0900 |
| commit | 3bc324922663bda59af5cdc409e8df3ed217d296 (patch) | |
| tree | 1c9c7d527c4fd3383350d54acd7d15b9c5c4f639 /arch/arm/mach-at91/at91sam9g45_devices.c | |
| parent | 9d3493e84def26bd9b0bab825629063bacc89383 (diff) | |
| parent | 3951e4aae2ce7e4593e575e91cbb22f1ba153596 (diff) | |
| download | linux-3bc324922663bda59af5cdc409e8df3ed217d296.tar.gz linux-3bc324922663bda59af5cdc409e8df3ed217d296.tar.bz2 linux-3bc324922663bda59af5cdc409e8df3ed217d296.zip | |
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
Diffstat (limited to 'arch/arm/mach-at91/at91sam9g45_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9g45_devices.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index fcd233cb33d2..d26474a97fec 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -1459,7 +1459,7 @@ static struct resource ssc0_resources[] = { }; static struct platform_device at91sam9g45_ssc0_device = { - .name = "ssc", + .name = "at91sam9g45_ssc", .id = 0, .dev = { .dma_mask = &ssc0_dmamask, @@ -1501,7 +1501,7 @@ static struct resource ssc1_resources[] = { }; static struct platform_device at91sam9g45_ssc1_device = { - .name = "ssc", + .name = "at91sam9g45_ssc", .id = 1, .dev = { .dma_mask = &ssc1_dmamask, |