diff options
-rw-r--r-- | arch/arm/mach-sa1100/Makefile | 2 | ||||
-rw-r--r-- | drivers/gpio/Makefile | 2 | ||||
-rw-r--r-- | drivers/gpio/gpio-sa1100.c (renamed from arch/arm/mach-sa1100/gpio.c) | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile index 41252d22e65..73a5c643179 100644 --- a/arch/arm/mach-sa1100/Makefile +++ b/arch/arm/mach-sa1100/Makefile | |||
@@ -3,7 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | # Common support | 5 | # Common support |
6 | obj-y := clock.o generic.o gpio.o irq.o dma.o time.o #nmi-oopser.o | 6 | obj-y := clock.o generic.o irq.o dma.o time.o #nmi-oopser.o |
7 | obj-m := | 7 | obj-m := |
8 | obj-n := | 8 | obj-n := |
9 | obj- := | 9 | obj- := |
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 33e095bdb65..84bc7389e36 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile | |||
@@ -45,7 +45,7 @@ obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o | |||
45 | obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o | 45 | obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o |
46 | obj-$(CONFIG_GPIO_S5PC100) += gpio-s5pc100.o | 46 | obj-$(CONFIG_GPIO_S5PC100) += gpio-s5pc100.o |
47 | obj-$(CONFIG_GPIO_S5PV210) += gpio-s5pv210.o | 47 | obj-$(CONFIG_GPIO_S5PV210) += gpio-s5pv210.o |
48 | 48 | obj-$(CONFIG_ARCH_SA1100) += gpio-sa1100.o | |
49 | obj-$(CONFIG_GPIO_SCH) += gpio-sch.o | 49 | obj-$(CONFIG_GPIO_SCH) += gpio-sch.o |
50 | obj-$(CONFIG_GPIO_STMPE) += gpio-stmpe.o | 50 | obj-$(CONFIG_GPIO_STMPE) += gpio-stmpe.o |
51 | obj-$(CONFIG_GPIO_SX150X) += gpio-sx150x.o | 51 | obj-$(CONFIG_GPIO_SX150X) += gpio-sx150x.o |
diff --git a/arch/arm/mach-sa1100/gpio.c b/drivers/gpio/gpio-sa1100.c index e547ed41ec6..b6c1f6d8064 100644 --- a/arch/arm/mach-sa1100/gpio.c +++ b/drivers/gpio/gpio-sa1100.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | 13 | ||
14 | #include <mach/hardware.h> | 14 | #include <mach/hardware.h> |
15 | #include "generic.h" | ||
16 | 15 | ||
17 | static int sa1100_gpio_get(struct gpio_chip *chip, unsigned offset) | 16 | static int sa1100_gpio_get(struct gpio_chip *chip, unsigned offset) |
18 | { | 17 | { |