From 9552234e0ae44a51742ac34f6972622f42876221 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 3 Nov 2011 16:15:38 +0900
Subject: [PATCH] --- yaml --- r: 281699 b: refs/heads/master c:
 4ff13995b512cfadef44e0bf5cb15298d6094519 h: refs/heads/master i:   281697:
 1388c873b7304db10e87a1d7b1e16b7fbef169b8   281695:
 916728a4afed748f5d9384f4375f3d23d4462472 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/mach-s3c64xx/Kconfig | 6 +++---
 trunk/arch/arm/plat-samsung/Kconfig | 8 ++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3f964eba6309..b0bc6c607cc1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b462c20e2915e6eca2fb812b4f63c94e7e042b9a
+refs/heads/master: 4ff13995b512cfadef44e0bf5cb15298d6094519
diff --git a/trunk/arch/arm/mach-s3c64xx/Kconfig b/trunk/arch/arm/mach-s3c64xx/Kconfig
index 5552e048c2be..4d8c489edc04 100644
--- a/trunk/arch/arm/mach-s3c64xx/Kconfig
+++ b/trunk/arch/arm/mach-s3c64xx/Kconfig
@@ -188,7 +188,7 @@ config SMDK6410_WM1190_EV1
 	depends on MACH_SMDK6410
 	select REGULATOR
 	select REGULATOR_WM8350
-	select S3C24XX_GPIO_EXTRA64
+	select SAMSUNG_GPIO_EXTRA64
 	select MFD_WM8350_I2C
 	select MFD_WM8350_CONFIG_MODE_0
 	select MFD_WM8350_CONFIG_MODE_3
@@ -206,7 +206,7 @@ config SMDK6410_WM1192_EV1
 	depends on MACH_SMDK6410
 	select REGULATOR
 	select REGULATOR_WM831X
-	select S3C24XX_GPIO_EXTRA64
+	select SAMSUNG_GPIO_EXTRA64
 	select MFD_WM831X
 	select MFD_WM831X_I2C
 	help
@@ -287,7 +287,7 @@ config MACH_WLF_CRAGG_6410
 	select S3C_DEV_WDT
 	select S3C_DEV_RTC
 	select S3C64XX_DEV_SPI
-	select S3C24XX_GPIO_EXTRA128
+	select SAMSUNG_GPIO_EXTRA128
 	select I2C
 	help
 	  Machine support for the Wolfson Cragganmore S3C6410 variant.
diff --git a/trunk/arch/arm/plat-samsung/Kconfig b/trunk/arch/arm/plat-samsung/Kconfig
index 313eb26cfa62..bb0af66bb487 100644
--- a/trunk/arch/arm/plat-samsung/Kconfig
+++ b/trunk/arch/arm/plat-samsung/Kconfig
@@ -88,12 +88,20 @@ config S5P_GPIO_DRVSTR
 
 config SAMSUNG_GPIO_EXTRA
 	int "Number of additional GPIO pins"
+	default 128 if SAMSUNG_GPIO_EXTRA128
+	default 64 if SAMSUNG_GPIO_EXTRA64
 	default 0
 	help
 	  Use additional GPIO space in addition to the GPIO's the SOC
 	  provides. This allows expanding the GPIO space for use with
 	  GPIO expanders.
 
+config SAMSUNG_GPIO_EXTRA64
+	bool
+
+config SAMSUNG_GPIO_EXTRA128
+	bool
+
 config S3C_GPIO_SPACE
 	int "Space between gpio banks"
 	default 0