From 1b551f3eaf2728b7337f8f6d8f7c1b6d51885668 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@canonical.com>
Date: Thu, 7 Jun 2012 15:29:38 +0100
Subject: [PATCH 22/34] UBUNTU: [Config] highbank -- commonise GPIO settings

Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian.master/config/amd64/config.common.amd64     |   12 ------------
 debian.master/config/armel/config.common.armel     |   12 ------------
 debian.master/config/armhf/config.flavour.highbank |   12 ------------
 debian.master/config/armhf/config.flavour.omap     |   12 ------------
 debian.master/config/config.common.ubuntu          |   12 ++++++++++++
 debian.master/config/i386/config.common.i386       |   12 ------------
 debian.master/config/powerpc/config.common.powerpc |   12 ------------
 debian.master/config/ppc64/config.common.ppc64     |   12 ------------
 8 files changed, 12 insertions(+), 84 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index d8dfe10..bc821da 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -125,19 +125,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADP5588=m
 CONFIG_GPIO_CS5535=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_IT8761E=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=m
 CONFIG_HAMRADIO=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index e4d7e46..e2095e2 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -116,18 +116,6 @@ CONFIG_FTRACE=y
 # CONFIG_FUNCTION_TRACER is not set
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_IT8761E=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 cf98dad..1c9fc65 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -76,18 +76,6 @@ CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FT1000 is not set
 # CONFIG_FTRACE is not set
 # CONFIG_GFS2_FS_LOCKING_DLM is not set
-# CONFIG_GPIO_74X164 is not set
-# CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_IT8761E 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 443da3b..1f82eb0 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -76,18 +76,6 @@ CONFIG_FSCACHE=m
 CONFIG_FT1000=m
 CONFIG_FTRACE=y
 CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_IT8761E=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 c447907..ad9dd9d 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1778,17 +1778,29 @@ 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_GENERIC=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
+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 209bdfb..d41d51d 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -125,18 +125,6 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_PENDING_IRQ=y
 # CONFIG_GENERIC_TIME_VSYSCALL is not set
 CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_IT8761E=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=m
 CONFIG_HAMRADIO=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 8ddd1e8..afba0ff 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -114,18 +114,6 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_GENERIC_PENDING_IRQ is not set
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_IT8761E=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 9281f68..1ec81ca 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -124,18 +124,6 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_GENERIC_PENDING_IRQ is not set
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADP5588=m
-CONFIG_GPIO_GENERIC_PLATFORM=m
-CONFIG_GPIO_IT8761E=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
-- 
1.7.9.5

