From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Sat, 3 May 2014 15:57:00 +0000 (+0100)
Subject: ARM: at91: at91sam9260: change at91_adc name
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=301841a634976c1cef4490cae577ffd0f26d0149;p=deliverable%2Flinux.git

ARM: at91: at91sam9260: change at91_adc name

We can't use "at91_adc" to refer to the at91_adc driver anymore as
the name is used to match an id_table.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---

diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index eda8d1679d40..0a0315920963 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -1292,7 +1292,7 @@ static struct resource adc_resources[] = {
 };
 
 static struct platform_device at91_adc_device = {
-	.name		= "at91_adc",
+	.name		= "at91sam9260-adc",
 	.id		= -1,
 	.dev		= {
 				.platform_data		= &adc_data,