aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2014-05-03 16:57:00 +0100
committerJonathan Cameron <jic23@kernel.org>2014-03-15 15:31:58 +0000
commit142df13b7598d88de5b163464e74d2101912f479 (patch)
tree9988788d3dd18779e2f761cbf42d520bad3acf0c
parentiio: cm32181: Fix read integration time function (diff)
downloadlinux-dev-142df13b7598d88de5b163464e74d2101912f479.tar.xz
linux-dev-142df13b7598d88de5b163464e74d2101912f479.zip
ARM: at91: at91sam9g45: 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>
-rw-r--r--arch/arm/mach-at91/at91sam9g45_devices.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index cb36fa872d30..88554024eb2d 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -1203,7 +1203,7 @@ static struct resource adc_resources[] = {
};
static struct platform_device at91_adc_device = {
- .name = "at91_adc",
+ .name = "at91sam9g45-adc",
.id = -1,
.dev = {
.platform_data = &adc_data,