diff options
-rw-r--r-- | arch/arm/mach-lpc32xx/Makefile | 2 | ||||
-rw-r--r-- | drivers/gpio/Makefile | 1 | ||||
-rw-r--r-- | drivers/gpio/gpio-lpc32xx.c (renamed from arch/arm/mach-lpc32xx/gpiolib.c) | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-lpc32xx/Makefile b/arch/arm/mach-lpc32xx/Makefile index a5fc5d0eeaeb..f5db805ab958 100644 --- a/arch/arm/mach-lpc32xx/Makefile +++ b/arch/arm/mach-lpc32xx/Makefile | |||
@@ -3,6 +3,6 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := timer.o irq.o common.o serial.o clock.o | 5 | obj-y := timer.o irq.o common.o serial.o clock.o |
6 | obj-y += gpiolib.o pm.o suspend.o | 6 | obj-y += pm.o suspend.o |
7 | obj-y += phy3250.o | 7 | obj-y += phy3250.o |
8 | 8 | ||
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 226982277330..33e095bdb65c 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile | |||
@@ -21,6 +21,7 @@ obj-$(CONFIG_GPIO_IT8761E) += gpio-it8761e.o | |||
21 | obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o | 21 | obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o |
22 | obj-$(CONFIG_MACH_KS8695) += gpio-ks8695.o | 22 | obj-$(CONFIG_MACH_KS8695) += gpio-ks8695.o |
23 | obj-$(CONFIG_GPIO_LANGWELL) += gpio-langwell.o | 23 | obj-$(CONFIG_GPIO_LANGWELL) += gpio-langwell.o |
24 | obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o | ||
24 | obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o | 25 | obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o |
25 | obj-$(CONFIG_GPIO_MAX7300) += gpio-max7300.o | 26 | obj-$(CONFIG_GPIO_MAX7300) += gpio-max7300.o |
26 | obj-$(CONFIG_GPIO_MAX7301) += gpio-max7301.o | 27 | obj-$(CONFIG_GPIO_MAX7301) += gpio-max7301.o |
diff --git a/arch/arm/mach-lpc32xx/gpiolib.c b/drivers/gpio/gpio-lpc32xx.c index 69061ea8997a..b4e9d35a6fa6 100644 --- a/arch/arm/mach-lpc32xx/gpiolib.c +++ b/drivers/gpio/gpio-lpc32xx.c | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
26 | #include <mach/platform.h> | 26 | #include <mach/platform.h> |
27 | #include "common.h" | ||
28 | 27 | ||
29 | #define LPC32XX_GPIO_P3_INP_STATE _GPREG(0x000) | 28 | #define LPC32XX_GPIO_P3_INP_STATE _GPREG(0x000) |
30 | #define LPC32XX_GPIO_P3_OUTP_SET _GPREG(0x004) | 29 | #define LPC32XX_GPIO_P3_OUTP_SET _GPREG(0x004) |