]> git.openfabrics.org - ~shefty/rdma-dev.git/blobdiff - arch/arm/mach-at91/at91sam9260_devices.c
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
[~shefty/rdma-dev.git] / arch / arm / mach-at91 / at91sam9260_devices.c
index 414bd855fb0cb7fd1d0295012016937175d9c449..e67cfa2acbe00d05fe773630113b3331cc4661eb 100644 (file)
@@ -742,7 +742,7 @@ static struct resource ssc_resources[] = {
 };
 
 static struct platform_device at91sam9260_ssc_device = {
-       .name   = "ssc",
+       .name   = "at91rm9200_ssc",
        .id     = 0,
        .dev    = {
                .dma_mask               = &ssc_dmamask,