diff -urpN -X ../dontdiff linux-2.6.20-rc7-dma1/arch/arm/mach-s3c2410/Kconfig linux-2.6.20-rc7-dma1-gpio1/arch/arm/mach-s3c2410/Kconfig
--- linux-2.6.20-rc7-dma1/arch/arm/mach-s3c2410/Kconfig	2007-02-03 15:47:38.000000000 +0000
+++ linux-2.6.20-rc7-dma1-gpio1/arch/arm/mach-s3c2410/Kconfig	2007-02-03 23:00:52.000000000 +0000
@@ -158,6 +158,11 @@ config S3C2410_CLOCK
 	help
 	  Clock code for the S3C2410, and similar processors
 
+config S3C2410_GPIO
+	bool
+	help
+	  GPIO code for S3C2410 and similar processors
+
 config S3C2410_PM
 	bool
 	help
@@ -174,6 +179,7 @@ config CPU_S3C2410
 	bool
 	depends on ARCH_S3C2410
 	select S3C2410_CLOCK
+	select S3C2410_GPIO
 	select S3C2410_PM if PM
 	help
 	  Support for S3C2410 and S3C2410A family from the S3C24XX line
@@ -223,6 +229,7 @@ config CPU_S3C2440
 	depends on ARCH_S3C2410
 	select S3C2410_CLOCK
 	select S3C2410_PM if PM
+	select S3C2410_GPIO
 	select S3C2440_DMA if S3C2410_DMA
 	select CPU_S3C244X
 	help
@@ -232,6 +239,7 @@ config CPU_S3C2442
 	bool
 	depends on ARCH_S3C2420
 	select S3C2410_CLOCK
+	select S3C2410_GPIO
 	select S3C2410_PM if PM
 	select CPU_S3C244X
 	help
diff -urpN -X ../dontdiff linux-2.6.20-rc7-dma1/arch/arm/mach-s3c2410/Makefile linux-2.6.20-rc7-dma1-gpio1/arch/arm/mach-s3c2410/Makefile
--- linux-2.6.20-rc7-dma1/arch/arm/mach-s3c2410/Makefile	2007-02-03 13:16:56.000000000 +0000
+++ linux-2.6.20-rc7-dma1-gpio1/arch/arm/mach-s3c2410/Makefile	2007-02-04 02:41:00.000000000 +0000
@@ -19,10 +19,10 @@ obj-$(CONFIG_CPU_S3C2400)	+= s3c2400-gpi
 # S3C2410 support files
 
 obj-$(CONFIG_CPU_S3C2410)	+= s3c2410.o
-obj-$(CONFIG_CPU_S3C2410)	+= s3c2410-gpio.o
 obj-$(CONFIG_CPU_S3C2410)	+= s3c2410-irq.o
 
 obj-$(CONFIG_S3C2410_PM)	+= s3c2410-pm.o s3c2410-sleep.o
+obj-$(CONFIG_S3C2410_GPIO)	+= s3c2410-gpio.o
 obj-$(CONFIG_CPU_S3C2410_DMA)	+= s3c2410-dma.o
 
 # Power Management support
@@ -54,7 +54,6 @@ obj-$(CONFIG_S3C2410_CLOCK)	+= s3c2410-c
 obj-$(CONFIG_CPU_S3C2440)	+= s3c2440.o s3c2440-dsc.o
 obj-$(CONFIG_CPU_S3C2440)	+= s3c2440-irq.o
 obj-$(CONFIG_CPU_S3C2440)	+= s3c2440-clock.o
-obj-$(CONFIG_CPU_S3C2440)	+= s3c2410-gpio.o
 obj-$(CONFIG_S3C2440_DMA)	+= s3c2440-dma.o
 
 # S3C2442 support