summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2014-05-03 17:57:00 +0200
committerJonathan Cameron <jic23@kernel.org>2014-03-15 16:32:16 +0100
commit301841a634976c1cef4490cae577ffd0f26d0149 (patch)
tree47013f04d1b094633ecee893d4aa6fdc806e7822 /arch
parentARM: at91: at91sam9g45: change at91_adc name (diff)
downloadlinux-301841a634976c1cef4490cae577ffd0f26d0149.tar.xz
linux-301841a634976c1cef4490cae577ffd0f26d0149.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-at91/at91sam9260_devices.c2
1 files changed, 1 insertions, 1 deletions
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,