UBUNTU: [Config] highbank -- commonise T modules missmatches

    CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
    CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
    CONFIG_TPS6105X=m
    CONFIG_TPS65010=m
    CONFIG_TPS6507X=m
    CONFIG_TRACE_SINK=m
    CONFIG_TRANZPORT=m
    CONFIG_TUN=y
    CONFIG_TWL4030_MADC=m
    CONFIG_TWL6030_PWM=m
    CONFIG_TWL6030_USB=m

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

8 files changed, 12 insertions, 78 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 2601067c64b..269f0d8bc4e 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -209,7 +209,6 @@ CONFIG_PRINTK_TIME=y
 CONFIG_PSTORE=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_RCU_FANOUT=64
-CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -265,16 +264,8 @@ CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
-CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_TRACE_SINK=m
-CONFIG_TRANZPORT=m
-CONFIG_TUN=y
 # CONFIG_TWL4030_CORE is not set
 CONFIG_TWL6040_CORE=y
 CONFIG_UIO=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 8cd0baf4cbe..6101cb52184 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -214,7 +214,6 @@ CONFIG_PRINTK_TIME=y
 CONFIG_PRINT_QUOTA_WARNING=y
 CONFIG_PSTORE=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -270,23 +269,12 @@ CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
-CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 # CONFIG_TOUCHSCREEN_EETI is not set
 # CONFIG_TOUCHSCREEN_EGALAX is not set
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
 CONFIG_TOUCHSCREEN_W90X900=m
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_TRACE_SINK=m
-CONFIG_TRANZPORT=m
-CONFIG_TUN=y
 CONFIG_TWL4030_CORE=y
-CONFIG_TWL4030_MADC=m
 CONFIG_TWL4030_POWER=y
 CONFIG_TWL4030_USB=y
-CONFIG_TWL6030_PWM=m
-CONFIG_TWL6030_USB=m
 CONFIG_TWL6040_CORE=y
 CONFIG_UIO=m
 CONFIG_ULTRIX_PARTITION=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 95f7d906419..8658cca974c 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -151,7 +151,6 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_PRINTK_TIME is not set
 # CONFIG_PSTORE is not set
 # CONFIG_QUOTA_NETLINK_INTERFACE is not set
-# CONFIG_REGULATOR is not set
 # CONFIG_REISERFS_FS_POSIX_ACL is not set
 # CONFIG_REISERFS_FS_SECURITY is not set
 # CONFIG_RELAY is not set
@@ -189,19 +188,8 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_TEST_KSTRTOX is not set
-# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
-# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
 # CONFIG_TOUCHSCREEN_W90X900 is not set
-# CONFIG_TPS6105X is not set
-# CONFIG_TPS65010 is not set
-# CONFIG_TPS6507X is not set
-# CONFIG_TRACE_SINK is not set
-# CONFIG_TRANZPORT is not set
-CONFIG_TUN=m
-# CONFIG_TWL4030_MADC is not set
 # CONFIG_TWL4030_POWER is not set
-# CONFIG_TWL6030_PWM is not set
-# CONFIG_TWL6030_USB is not set
 # CONFIG_TWL6040_CORE is not set
 # CONFIG_UIO is not set
 # CONFIG_ULTRIX_PARTITION is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index d72cb39ab0e..5596910b9f9 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -151,7 +151,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PSTORE=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_REGULATOR=y
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
@@ -189,19 +188,8 @@ CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
-CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
 CONFIG_TOUCHSCREEN_W90X900=m
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_TRACE_SINK=m
-CONFIG_TRANZPORT=m
-CONFIG_TUN=y
-CONFIG_TWL4030_MADC=m
 CONFIG_TWL4030_POWER=y
-CONFIG_TWL6030_PWM=m
-CONFIG_TWL6030_USB=m
 CONFIG_TWL6040_CORE=y
 CONFIG_UIO=m
 CONFIG_ULTRIX_PARTITION=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 880d1180275..66f0d5a2831 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4292,6 +4292,7 @@ CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_REGMAP_SPI=y
+CONFIG_REGULATOR=y
 CONFIG_REGULATOR_88PM8607=y
 CONFIG_REGULATOR_AAT2870=m
 CONFIG_REGULATOR_AB3100=m
@@ -5462,6 +5463,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
@@ -5485,6 +5487,7 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_TOUCHSCREEN_PIXCIR=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_STMPE=m
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
 CONFIG_TOUCHSCREEN_TI_TSCADC=m
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
@@ -5519,16 +5522,21 @@ CONFIG_TOUCHSCREEN_WM9705=y
 CONFIG_TOUCHSCREEN_WM9712=y
 CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
 CONFIG_TR=y
 CONFIG_TRACEPOINTS=y
 CONFIG_TRACER_MAX_TRACE=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_TRACE_ROUTER=m
+CONFIG_TRACE_SINK=m
 CONFIG_TRACING=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
 CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANZPORT=m
 CONFIG_TREE_PREEMPT_RCU=y
 CONFIG_TREE_RCU=y
 # CONFIG_TREE_RCU_TRACE is not set
@@ -5540,8 +5548,12 @@ CONFIG_TULIP=m
 # CONFIG_TULIP_MMIO is not set
 # CONFIG_TULIP_MWI is not set
 # CONFIG_TULIP_NAPI is not set
+CONFIG_TUN=y
 # CONFIG_TUNE_CELL is not set
+CONFIG_TWL4030_MADC=m
 CONFIG_TWL4030_WATCHDOG=m
+CONFIG_TWL6030_PWM=m
+CONFIG_TWL6030_USB=m
 CONFIG_TYPHOON=m
 CONFIG_U3_DART=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 0af1729cd26..24780ce647d 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -209,7 +209,6 @@ CONFIG_PRINTK_TIME=y
 CONFIG_PSTORE=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_RCU_FANOUT=32
-CONFIG_REGULATOR=y
 CONFIG_REGULATOR_DEBUG=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -265,16 +264,8 @@ CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
-CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_TRACE_SINK=m
-CONFIG_TRANZPORT=m
-CONFIG_TUN=y
 # CONFIG_TWL4030_CORE is not set
 CONFIG_TWL6040_CORE=y
 CONFIG_UIO=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index eb3f8a466ba..180a3484605 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -199,7 +199,6 @@ CONFIG_PRINTK_TIME=y
 CONFIG_PSERIES_ENERGY=m
 CONFIG_PSTORE=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -255,21 +254,10 @@ CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
-CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_TRACE_SINK=m
-CONFIG_TRANZPORT=m
-CONFIG_TUN=y
 CONFIG_TWL4030_CORE=y
-CONFIG_TWL4030_MADC=m
 CONFIG_TWL4030_USB=m
-CONFIG_TWL6030_PWM=m
-CONFIG_TWL6030_USB=m
 CONFIG_TWL6040_CORE=y
 CONFIG_UIO=m
 CONFIG_ULTRIX_PARTITION=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 9ea70997d0c..7a7ae897244 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -232,7 +232,6 @@ CONFIG_PSERIES_ENERGY=y
 CONFIG_PSTORE=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_RCU_FANOUT=64
-CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
@@ -289,21 +288,10 @@ CONFIG_TCG_TPM=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_TEST_KSTRTOX=m
-CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_TPS6105X=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-CONFIG_TRACE_SINK=m
-CONFIG_TRANZPORT=m
-CONFIG_TUN=y
 CONFIG_TWL4030_CORE=y
-CONFIG_TWL4030_MADC=m
 CONFIG_TWL4030_USB=m
-CONFIG_TWL6030_PWM=m
-CONFIG_TWL6030_USB=m
 CONFIG_TWL6040_CORE=y
 CONFIG_UIO=m
 CONFIG_ULTRIX_PARTITION=y