summaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91/at91sam9g45_devices.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-02 04:34:58 (GMT)
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-02 04:34:58 (GMT)
commit3bc324922663bda59af5cdc409e8df3ed217d296 (patch)
tree1c9c7d527c4fd3383350d54acd7d15b9c5c4f639 /arch/arm/mach-at91/at91sam9g45_devices.c
parent9d3493e84def26bd9b0bab825629063bacc89383 (diff)
parent3951e4aae2ce7e4593e575e91cbb22f1ba153596 (diff)
downloadlinux-3bc324922663bda59af5cdc409e8df3ed217d296.tar.xz
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.c4
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 fcd233c..d26474a 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,