UBUNTU: [Config] highbank -- commonise GPIO settings

Signed-off-by: Andy Whitcroft <apw@canonical.com>

8 files changed, 11 insertions, 77 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index a451c6318ca..c836d1297fa 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -110,17 +110,6 @@ CONFIG_FT1000=m
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_SX150X=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAMRADIO=y
 CONFIG_HARDLOCKUP_DETECTOR=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 81d0b1e807e..d2fbfb7f218 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -111,17 +111,6 @@ CONFIG_FSCACHE=m
 CONFIG_FT1000=m
 CONFIG_FTRACE=y
 # CONFIG_FUNCTION_TRACER is not set
-CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_SX150X=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_TWL4030=y
 CONFIG_HAMRADIO=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 344057cd703..d3488ad2e0b 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -76,17 +76,6 @@ CONFIG_EXT2_FS=y
 # CONFIG_FSCACHE is not set
 # CONFIG_FT1000 is not set
 # CONFIG_FTRACE is not set
-# CONFIG_GPIO_74X164 is not set
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_MAX7300 is not set
-# CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_GPIO_PCA953X is not set
-# CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSFS is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_HIDRAW is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 2379715c60f..8ba334013f4 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -76,17 +76,6 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FSCACHE=m
 CONFIG_FT1000=m
 CONFIG_FTRACE=y
-CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_SX150X=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAMRADIO=y
 CONFIG_HIDRAW=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index a07ff34fd32..6a41f349419 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1877,20 +1877,31 @@ CONFIG_GIGASET_M105=m
 CONFIG_GIRBIL_DONGLE=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 CONFIG_GPIOLIB=y
+CONFIG_GPIO_74X164=m
 CONFIG_GPIO_ADP5520=m
+CONFIG_GPIO_ADP5588=m
 CONFIG_GPIO_CS5535=m
 CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
 CONFIG_GPIO_INTEL_PMIC=y
 CONFIG_GPIO_IT8761E=m
 CONFIG_GPIO_JANZ_TTL=m
 CONFIG_GPIO_LANGWELL=y
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MAX730X=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_MC33880=m
+CONFIG_GPIO_MCP23S08=m
 CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
 CONFIG_GPIO_PCH=m
 CONFIG_GPIO_PL061=y
 CONFIG_GPIO_RDC321X=m
 CONFIG_GPIO_SCH=m
 CONFIG_GPIO_STMPE=y
+CONFIG_GPIO_SX150X=y
 CONFIG_GPIO_TC3589X=y
 CONFIG_GPIO_TIMBERDALE=y
 CONFIG_GPIO_TPS65910=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index a02a463e6ae..a6d8de4a2f2 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -109,17 +109,6 @@ CONFIG_FT1000=m
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
 # CONFIG_GENERIC_TIME_VSYSCALL is not set
-CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_SX150X=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAMRADIO=y
 CONFIG_HARDLOCKUP_DETECTOR=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 158bc5b36e0..23bbb420c27 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -99,17 +99,6 @@ CONFIG_FT1000=m
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_SX150X=y
 # CONFIG_GPIO_SYSFS is not set
 CONFIG_GPIO_TWL4030=m
 CONFIG_HAMRADIO=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 90dc257fcbd..18ddc51b7b5 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -109,17 +109,6 @@ CONFIG_FT1000=m
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_MAX7300=m
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_SX150X=y
 # CONFIG_GPIO_SYSFS is not set
 CONFIG_GPIO_TWL4030=m
 CONFIG_HAMRADIO=y