aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2007-02-09 13:24:45 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-02-11 11:54:33 -0500
commitd19494b187b20e363f9b434b9ceab4159ac88324 (patch)
tree10f63338f5e8ac5772e687f66ed2501a5923df4b
parent4c784ef76ac4443ab13648859f1b2a2737546cc1 (diff)
[ARM] 4156/1: S3C24XX: Add CONFIG_S3C2410_GPIO
In preperation for splitting the arch-s3c2410 directory up, add a CONFIG_S3C2410_GPIO instead of implicitly making the .o for CONFIG_CPU_S3C2410 and CONFIG_CPU_S3C2440 Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-s3c2410/Kconfig8
-rw-r--r--arch/arm/mach-s3c2410/Makefile3
2 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 6329b4066f78..0ab590ec4582 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -158,6 +158,11 @@ config S3C2410_CLOCK
158 help 158 help
159 Clock code for the S3C2410, and similar processors 159 Clock code for the S3C2410, and similar processors
160 160
161config S3C2410_GPIO
162 bool
163 help
164 GPIO code for S3C2410 and similar processors
165
161config S3C2410_PM 166config S3C2410_PM
162 bool 167 bool
163 help 168 help
@@ -174,6 +179,7 @@ config CPU_S3C2410
174 bool 179 bool
175 depends on ARCH_S3C2410 180 depends on ARCH_S3C2410
176 select S3C2410_CLOCK 181 select S3C2410_CLOCK
182 select S3C2410_GPIO
177 select S3C2410_PM if PM 183 select S3C2410_PM if PM
178 help 184 help
179 Support for S3C2410 and S3C2410A family from the S3C24XX line 185 Support for S3C2410 and S3C2410A family from the S3C24XX line
@@ -223,6 +229,7 @@ config CPU_S3C2440
223 depends on ARCH_S3C2410 229 depends on ARCH_S3C2410
224 select S3C2410_CLOCK 230 select S3C2410_CLOCK
225 select S3C2410_PM if PM 231 select S3C2410_PM if PM
232 select S3C2410_GPIO
226 select S3C2440_DMA if S3C2410_DMA 233 select S3C2440_DMA if S3C2410_DMA
227 select CPU_S3C244X 234 select CPU_S3C244X
228 help 235 help
@@ -232,6 +239,7 @@ config CPU_S3C2442
232 bool 239 bool
233 depends on ARCH_S3C2420 240 depends on ARCH_S3C2420
234 select S3C2410_CLOCK 241 select S3C2410_CLOCK
242 select S3C2410_GPIO
235 select S3C2410_PM if PM 243 select S3C2410_PM if PM
236 select CPU_S3C244X 244 select CPU_S3C244X
237 help 245 help
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index 85ffa1274b0b..1cc5febdaabd 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -19,10 +19,10 @@ obj-$(CONFIG_CPU_S3C2400) += s3c2400-gpio.o
19# S3C2410 support files 19# S3C2410 support files
20 20
21obj-$(CONFIG_CPU_S3C2410) += s3c2410.o 21obj-$(CONFIG_CPU_S3C2410) += s3c2410.o
22obj-$(CONFIG_CPU_S3C2410) += s3c2410-gpio.o
23obj-$(CONFIG_CPU_S3C2410) += s3c2410-irq.o 22obj-$(CONFIG_CPU_S3C2410) += s3c2410-irq.o
24 23
25obj-$(CONFIG_S3C2410_PM) += s3c2410-pm.o s3c2410-sleep.o 24obj-$(CONFIG_S3C2410_PM) += s3c2410-pm.o s3c2410-sleep.o
25obj-$(CONFIG_S3C2410_GPIO) += s3c2410-gpio.o
26obj-$(CONFIG_CPU_S3C2410_DMA) += s3c2410-dma.o 26obj-$(CONFIG_CPU_S3C2410_DMA) += s3c2410-dma.o
27 27
28# Power Management support 28# Power Management support
@@ -54,7 +54,6 @@ obj-$(CONFIG_S3C2410_CLOCK) += s3c2410-clock.o
54obj-$(CONFIG_CPU_S3C2440) += s3c2440.o s3c2440-dsc.o 54obj-$(CONFIG_CPU_S3C2440) += s3c2440.o s3c2440-dsc.o
55obj-$(CONFIG_CPU_S3C2440) += s3c2440-irq.o 55obj-$(CONFIG_CPU_S3C2440) += s3c2440-irq.o
56obj-$(CONFIG_CPU_S3C2440) += s3c2440-clock.o 56obj-$(CONFIG_CPU_S3C2440) += s3c2440-clock.o
57obj-$(CONFIG_CPU_S3C2440) += s3c2410-gpio.o
58obj-$(CONFIG_S3C2440_DMA) += s3c2440-dma.o 57obj-$(CONFIG_S3C2440_DMA) += s3c2440-dma.o
59 58
60# S3C2442 support 59# S3C2442 support