diff options
| author | Mark Brown | 2012-12-02 05:34:58 +0100 |
|---|---|---|
| committer | Mark Brown | 2012-12-02 05:34:58 +0100 |
| commit | 3bc324922663bda59af5cdc409e8df3ed217d296 (patch) | |
| tree | 1c9c7d527c4fd3383350d54acd7d15b9c5c4f639 /arch/arm/mach-at91/at91rm9200_devices.c | |
| parent | Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next (diff) | |
| parent | ASoC: atmel-pcm: dma support based on pcm dmaengine (diff) | |
| download | kernel-qcow2-linux-3bc324922663bda59af5cdc409e8df3ed217d296.tar.gz kernel-qcow2-linux-3bc324922663bda59af5cdc409e8df3ed217d296.tar.xz kernel-qcow2-linux-3bc324922663bda59af5cdc409e8df3ed217d296.zip | |
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
Diffstat (limited to 'arch/arm/mach-at91/at91rm9200_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91rm9200_devices.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index 3cee0e6ea7c3..9e76427aaec2 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@ -752,7 +752,7 @@ static struct resource ssc0_resources[] = { }; static struct platform_device at91rm9200_ssc0_device = { - .name = "ssc", + .name = "at91rm9200_ssc", .id = 0, .dev = { .dma_mask = &ssc0_dmamask, @@ -794,7 +794,7 @@ static struct resource ssc1_resources[] = { }; static struct platform_device at91rm9200_ssc1_device = { - .name = "ssc", + .name = "at91rm9200_ssc", .id = 1, .dev = { .dma_mask = &ssc1_dmamask, @@ -836,7 +836,7 @@ static struct resource ssc2_resources[] = { }; static struct platform_device at91rm9200_ssc2_device = { - .name = "ssc", + .name = "at91rm9200_ssc", .id = 2, .dev = { .dma_mask = &ssc2_dmamask, |