UBUNTU: [Config] highbank -- commonise I2C settings

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

8 files changed, 13 insertions, 91 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index c836d1297fa..31eb4154867 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -124,20 +124,7 @@ CONFIG_HUGETLB_PAGE=y
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_GPIO=m
 # CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_MUX=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_XILINX=m
 # CONFIG_IDE is not set
 CONFIG_IIO=m
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index d2fbfb7f218..079b6c87ee4 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -128,21 +128,8 @@ CONFIG_HVC_DCC=y
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=128
 CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_GPIO=m
 # CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_MUX=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_XILINX=m
 CONFIG_IIO=m
 CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index d3488ad2e0b..630987c8095 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -87,21 +87,8 @@ CONFIG_HIGHMEM=y
 # CONFIG_HVC_DCC is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_HZ=100
-# CONFIG_I2C_CHARDEV is not set
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
-# CONFIG_I2C_DIOLAN_U2C is not set
-# CONFIG_I2C_GPIO is not set
 CONFIG_I2C_HELPER_AUTO=y
-# CONFIG_I2C_MUX is not set
-# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PCA_PLATFORM is not set
-# CONFIG_I2C_SIMTEC is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_TAOS_EVM is not set
-# CONFIG_I2C_TINY_USB is not set
-# CONFIG_I2C_XILINX is not set
 # CONFIG_IIO is not set
 # CONFIG_INLINE_READ_UNLOCK is not set
 # CONFIG_INLINE_READ_UNLOCK_IRQ is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 8ba334013f4..db4f88bdac8 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -87,21 +87,8 @@ CONFIG_HTC_PASIC3=m
 CONFIG_HVC_DCC=y
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=128
-CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_GPIO=m
 # CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_MUX=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_XILINX=m
 CONFIG_IIO=m
 CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 6a41f349419..cc995acd85b 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2195,37 +2195,50 @@ CONFIG_I2C_AMD756=m
 CONFIG_I2C_AMD756_S4882=m
 CONFIG_I2C_AMD8111=m
 CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_COMPAT=y
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_DIOLAN_U2C=m
 CONFIG_I2C_EG20T=m
+CONFIG_I2C_GPIO=m
 CONFIG_I2C_HYDRA=m
 CONFIG_I2C_I801=m
 CONFIG_I2C_INTEL_MID=m
 CONFIG_I2C_ISCH=m
 CONFIG_I2C_MPC=m
+CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_NFORCE2=m
 CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_OCORES=m
 CONFIG_I2C_OMAP=y
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
 CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PCA_ISA=m
+CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_PIIX4=m
 CONFIG_I2C_POWERMAC=y
 # CONFIG_I2C_PXA_PCI is not set
 CONFIG_I2C_SCMI=m
 CONFIG_I2C_SI470X=m
 CONFIG_I2C_SI4713=m
+CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_SIS5595=m
 CONFIG_I2C_SIS630=m
 CONFIG_I2C_SIS96X=m
 CONFIG_I2C_SMBUS=m
+CONFIG_I2C_STUB=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
 CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_XILINX=m
 CONFIG_I2O=m
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_BUS=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index a6d8de4a2f2..41331b4242d 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -124,20 +124,7 @@ CONFIG_HUGETLB_PAGE=y
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_GPIO=m
 # CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_MUX=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_XILINX=m
 # CONFIG_IDE is not set
 CONFIG_IIO=m
 CONFIG_ILLEGAL_POINTER_VALUE=0
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 23bbb420c27..9d45c6180a3 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -114,20 +114,7 @@ CONFIG_HTC_PASIC3=m
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_GPIO=m
 CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_MUX=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_XILINX=m
 # CONFIG_IBMEBUS is not set
 # CONFIG_IDE is not set
 CONFIG_IIO=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 18ddc51b7b5..eb14831d6df 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -125,20 +125,7 @@ CONFIG_HVC_CONSOLE=y
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_DIOLAN_U2C=m
-CONFIG_I2C_GPIO=m
 CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_MUX=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_SIMTEC=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-CONFIG_I2C_XILINX=m
 CONFIG_IBMEBUS=y
 CONFIG_IDE=y
 CONFIG_IIO=m