diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-01 14:25:28 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 08:54:48 +0100 |
| commit | f4ad4d212f71f27e114942d25401e81b8555e19f (patch) | |
| tree | 802db88f0498a6103674f64ddd15e305a97f360d /arch/arm/mach-ux500/devices-common.c | |
| parent | 1bd182ea1414abdbe55653dcec9f681483d5e408 (diff) | |
mach-ux500: gpio/nomadik: move the Nomadik GPIO header
This takes the Nomadik GPIO header out of the plat-nomadik
directory and pushes it down into <gpio/nomadik> where it belongs.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/devices-common.c')
| -rw-r--r-- | arch/arm/mach-ux500/devices-common.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/devices-common.c b/arch/arm/mach-ux500/devices-common.c index 051d8cf8d79..c70b319ca75 100644 --- a/arch/arm/mach-ux500/devices-common.c +++ b/arch/arm/mach-ux500/devices-common.c @@ -13,8 +13,8 @@ #include <linux/platform_device.h> #include <linux/amba/bus.h> #include <linux/pm.h> - -#include <plat/gpio-nomadik.h> +#include <linux/gpio.h> +#include <linux/gpio/nomadik.h> #include <mach/hardware.h> #include <mach/pm.h> @@ -160,7 +160,6 @@ void dbx500_add_gpios(resource_size_t *base, int num, int irq, pdata->first_gpio = first; pdata->first_irq = NOMADIK_GPIO_TO_IRQ(first); pdata->num_gpio = 32; - dbx500_add_gpio(i, base[i], irq, pdata); } } |