diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-14 15:20:26 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2012-01-05 10:10:46 +0000 |
| commit | 7d5acd24fcab151d36192ba324379ccf9df04a03 (patch) | |
| tree | 5a9f673c74db832871632d81ecdcf1f264cb3ae9 /arch/arm | |
| parent | fde714c141a5eab2ac2c09e74b1350912d061b20 (diff) | |
mach-ux500: Fix for gpio header move
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-pins.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-pins-sleep-force.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 1d43c271910..3414e0b6845 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -10,7 +10,8 @@ #include <asm/mach-types.h> #include <plat/pincfg.h> -#include <plat/gpio-nomadik.h> +#include <linux/gpio/nomadik.h> + #include <mach/hardware.h> #include <mach/suspend.h> diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 3c1590f7796..96e0744610e 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -34,8 +34,9 @@ #include <linux/spi/stm_msp.h> #include <linux/leds_pwm.h> #include <linux/pwm_backlight.h> - +#include <linux/gpio/nomadik.h> #include <linux/leds.h> + #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -791,7 +792,7 @@ static struct platform_device *snowball_platform_devs[] __initdata = { &snowball_led_dev, &snowball_key_dev, &snowball_sbnet_dev, -// &ab8500_device, + &ab8500_device, &snowball_gpio_wlan_vbat_regulator_device, &u8500_mcde_device, &u8500_b2r2_device, diff --git a/arch/arm/mach-ux500/board-pins-sleep-force.c b/arch/arm/mach-ux500/board-pins-sleep-force.c index e86d25c0a21..bef6f4e6df4 100644 --- a/arch/arm/mach-ux500/board-pins-sleep-force.c +++ b/arch/arm/mach-ux500/board-pins-sleep-force.c @@ -10,7 +10,7 @@ #include <linux/io.h> #include <linux/string.h> -#include <plat/gpio.h> +#include <linux/gpio/nomadik.h> #include <mach/hardware.h> #include "board-pins-sleep-force.h" diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index 3d9ff06db93..2832de84621 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -10,6 +10,7 @@ #include <linux/interrupt.h> #include <linux/io.h> #include <linux/gpio.h> +#include <linux/gpio/nomadik.h> #include <linux/amba/bus.h> #include <linux/amba/pl022.h> |