diff options
-rw-r--r-- | arch/arm/mach-s5pc100/Makefile | 2 | ||||
-rw-r--r-- | drivers/gpio/Kconfig | 6 | ||||
-rw-r--r-- | drivers/gpio/Makefile | 1 | ||||
-rw-r--r-- | drivers/gpio/gpio-s5pc100.c (renamed from arch/arm/mach-s5pc100/gpiolib.c) | 0 |
4 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pc100/Makefile b/arch/arm/mach-s5pc100/Makefile index eecab57d2e5d..a5e6e608b498 100644 --- a/arch/arm/mach-s5pc100/Makefile +++ b/arch/arm/mach-s5pc100/Makefile | |||
@@ -11,7 +11,7 @@ obj- := | |||
11 | 11 | ||
12 | # Core support for S5PC100 system | 12 | # Core support for S5PC100 system |
13 | 13 | ||
14 | obj-$(CONFIG_CPU_S5PC100) += cpu.o init.o clock.o gpiolib.o | 14 | obj-$(CONFIG_CPU_S5PC100) += cpu.o init.o clock.o |
15 | obj-$(CONFIG_CPU_S5PC100) += setup-i2c0.o | 15 | obj-$(CONFIG_CPU_S5PC100) += setup-i2c0.o |
16 | obj-$(CONFIG_CPU_S5PC100) += dma.o | 16 | obj-$(CONFIG_CPU_S5PC100) += dma.o |
17 | 17 | ||
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 92d16fdec206..2c30911b2414 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig | |||
@@ -98,6 +98,12 @@ config GPIO_PLAT_SAMSUNG | |||
98 | help | 98 | help |
99 | Say yes here to support Samsung SoCs GPIO library | 99 | Say yes here to support Samsung SoCs GPIO library |
100 | 100 | ||
101 | config GPIO_S5PC100 | ||
102 | bool "Samsung S5PC100 GPIO library support" | ||
103 | default y if CPU_S5PC100 | ||
104 | help | ||
105 | Say yes here to support Samsung S5PC100 SoCs GPIO library | ||
106 | |||
101 | config GPIO_S5PV210 | 107 | config GPIO_S5PV210 |
102 | bool "Samsung S5PV210/S5PC110 GPIO library support" | 108 | bool "Samsung S5PV210/S5PC110 GPIO library support" |
103 | default y if CPU_S5PV210 | 109 | default y if CPU_S5PV210 |
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 2edf6d660b32..7d5b5470ed0d 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile | |||
@@ -10,6 +10,7 @@ obj-$(CONFIG_GPIO_BASIC_MMIO_CORE) += basic_mmio_gpio.o | |||
10 | obj-$(CONFIG_GPIO_BASIC_MMIO) += basic_mmio_gpio.o | 10 | obj-$(CONFIG_GPIO_BASIC_MMIO) += basic_mmio_gpio.o |
11 | obj-$(CONFIG_GPIO_EXYNOS4) += gpio-exynos4.o | 11 | obj-$(CONFIG_GPIO_EXYNOS4) += gpio-exynos4.o |
12 | obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o | 12 | obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o |
13 | obj-$(CONFIG_GPIO_S5PC100) += gpio-s5pc100.o | ||
13 | obj-$(CONFIG_GPIO_S5PV210) += gpio-s5pv210.o | 14 | obj-$(CONFIG_GPIO_S5PV210) += gpio-s5pv210.o |
14 | obj-$(CONFIG_GPIO_LANGWELL) += langwell_gpio.o | 15 | obj-$(CONFIG_GPIO_LANGWELL) += langwell_gpio.o |
15 | obj-$(CONFIG_GPIO_MAX730X) += max730x.o | 16 | obj-$(CONFIG_GPIO_MAX730X) += max730x.o |
diff --git a/arch/arm/mach-s5pc100/gpiolib.c b/drivers/gpio/gpio-s5pc100.c index 2842394b28b5..2842394b28b5 100644 --- a/arch/arm/mach-s5pc100/gpiolib.c +++ b/drivers/gpio/gpio-s5pc100.c | |||