From 14a1cbd9dd35af54d27ecf0dc4666cc948573a54 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Fri, 8 Jun 2012 11:58:36 +0100 Subject: [PATCH 33/34] UBUNTU: [Config] highbank -- commonise T modules missmatches CONFIG_TARGET_CORE=m 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 CONFIG_TEST_KSTRTOX=m CONFIG_THERMAL=y Signed-off-by: Andy Whitcroft --- debian.master/config/amd64/config.common.amd64 | 9 --------- debian.master/config/armel/config.common.armel | 12 ------------ debian.master/config/armhf/config.common.armhf | 2 ++ debian.master/config/armhf/config.flavour.highbank | 14 -------------- debian.master/config/armhf/config.flavour.omap | 14 -------------- debian.master/config/config.common.ubuntu | 12 ++++++++++++ debian.master/config/i386/config.common.i386 | 9 --------- debian.master/config/powerpc/config.common.powerpc | 12 ------------ debian.master/config/ppc64/config.common.ppc64 | 12 ------------ 9 files changed, 14 insertions(+), 82 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index b71977a..d3e29ef 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -251,7 +251,6 @@ CONFIG_RAW_DRIVER=m CONFIG_RCU_FANOUT=64 CONFIG_REGMAP_I2C=y CONFIG_REGMAP_SPI=y -CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_REISERFS_FS_POSIX_ACL=y @@ -321,22 +320,14 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_SYSV68_PARTITION=y CONFIG_SYS_HYPERVISOR=y CONFIG_TABLET_USB_WACOM=m -CONFIG_TARGET_CORE=m CONFIG_TASKSTATS=y CONFIG_TCG_TIS=m CONFIG_TCG_TPM=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y -CONFIG_TEST_KSTRTOX=m -CONFIG_THERMAL=y 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_CORE is not set CONFIG_TWL4030_USB=m CONFIG_UIO=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index ff5f37f..8845a26 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -237,7 +237,6 @@ CONFIG_RAMOOPS=m CONFIG_RAW_DRIVER=m CONFIG_REGMAP_I2C=y CONFIG_REGMAP_SPI=y -CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REISERFS_FS_POSIX_ACL=y @@ -302,27 +301,16 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_SYSV68_PARTITION=y # CONFIG_SYS_HYPERVISOR is not set CONFIG_TABLET_USB_WACOM=m -CONFIG_TARGET_CORE=m CONFIG_TASKSTATS=y # CONFIG_TCG_TPM is not set CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y -CONFIG_TEST_KSTRTOX=m -CONFIG_THERMAL=y 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_CORE=y -CONFIG_TWL4030_MADC=m CONFIG_TWL4030_POWER=y CONFIG_TWL4030_USB=y -CONFIG_TWL6030_PWM=m -CONFIG_TWL6030_USB=m CONFIG_UIO=m CONFIG_ULTRIX_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 2973bc0..c39a416 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -104,6 +104,8 @@ CONFIG_STE10XP=y # CONFIG_SYS_HYPERVISOR is not set CONFIG_TABLET_USB_WACOM=m # CONFIG_TCG_TPM is not set +CONFIG_TPS65010=m +CONFIG_TRANZPORT=m CONFIG_TWL4030_CORE=y CONFIG_TWL4030_USB=y # CONFIG_USB_ARCH_HAS_XHCI is not set diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index 4aaf75a..4f7460c 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -161,7 +161,6 @@ CONFIG_PREEMPT_RCU=y # CONFIG_RAW_DRIVER is not set CONFIG_REGMAP_I2C=m CONFIG_REGMAP_SPI=m -# 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 @@ -203,24 +202,11 @@ CONFIG_SWP_EMULATE=y # CONFIG_SYSCTL_SYSCALL is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set # CONFIG_SYSV68_PARTITION is not set -# CONFIG_TARGET_CORE is not set # CONFIG_TASKSTATS is not set # CONFIG_TCP_CONG_ADVANCED is not set # CONFIG_TCP_MD5SIG is not set -# CONFIG_TEST_KSTRTOX is not set -CONFIG_THERMAL=m # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set -# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 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_UIO is not set # CONFIG_ULTRIX_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index df1ba4d..0d57a90 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -161,7 +161,6 @@ CONFIG_RAMOOPS=m CONFIG_RAW_DRIVER=m CONFIG_REGMAP_I2C=y CONFIG_REGMAP_SPI=y -CONFIG_REGULATOR=y CONFIG_REISERFS_FS_POSIX_ACL=y CONFIG_REISERFS_FS_SECURITY=y CONFIG_RELAY=y @@ -203,24 +202,11 @@ CONFIG_SUN_PARTITION=y CONFIG_SYSCTL_SYSCALL=y CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_SYSV68_PARTITION=y -CONFIG_TARGET_CORE=m CONFIG_TASKSTATS=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y -CONFIG_TEST_KSTRTOX=m -CONFIG_THERMAL=y 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_TWL4030_POWER=y -CONFIG_TWL6030_PWM=m -CONFIG_TWL6030_USB=m CONFIG_UIO=m CONFIG_ULTRIX_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 489515a..a3aeb5b 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4110,6 +4110,7 @@ CONFIG_REALTEK_PHY=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_REGMAP=y +CONFIG_REGULATOR=y CONFIG_REGULATOR_88PM8607=y CONFIG_REGULATOR_AAT2870=m CONFIG_REGULATOR_AB3100=m @@ -5145,6 +5146,7 @@ CONFIG_TABLET_USB_AIPTEK=m CONFIG_TABLET_USB_GTCO=m CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m +CONFIG_TARGET_CORE=m CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_SIZE=0xc0000000 @@ -5176,12 +5178,14 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TEHUTI=m CONFIG_TEKRAM_DONGLE=m CONFIG_TELCLOCK=m +CONFIG_TEST_KSTRTOX=m # CONFIG_TEST_LIST_SORT is not set CONFIG_TEST_POWER=m CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_TEXTSEARCH_KMP=m +CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_THERM_ADT746X=y CONFIG_THERM_PM72=m @@ -5251,6 +5255,7 @@ CONFIG_TOUCHSCREEN_PCAP=m CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_STMPE=m +CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m CONFIG_TOUCHSCREEN_TOUCHWIN=m @@ -5283,11 +5288,14 @@ CONFIG_TOUCHSCREEN_WM9705=y CONFIG_TOUCHSCREEN_WM9712=y CONFIG_TOUCHSCREEN_WM9713=y CONFIG_TOUCHSCREEN_WM97XX=m +CONFIG_TPS6105X=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 @@ -5304,8 +5312,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_TWL6040_CORE=y CONFIG_TYPHOON=m CONFIG_U3_DART=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index f9692e0..5f7f6db 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -250,7 +250,6 @@ CONFIG_RAW_DRIVER=m CONFIG_RCU_FANOUT=32 CONFIG_REGMAP_I2C=y CONFIG_REGMAP_SPI=y -CONFIG_REGULATOR=y CONFIG_REGULATOR_DEBUG=y CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_REISERFS_FS_POSIX_ACL=y @@ -317,22 +316,14 @@ CONFIG_SYSCTL_SYSCALL=y CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_SYSV68_PARTITION=y CONFIG_TABLET_USB_WACOM=m -CONFIG_TARGET_CORE=m CONFIG_TASKSTATS=y CONFIG_TCG_TIS=m CONFIG_TCG_TPM=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y -CONFIG_TEST_KSTRTOX=m -CONFIG_THERMAL=y 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_CORE is not set CONFIG_TWL4030_USB=m CONFIG_UIO=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 4372c04..289a088 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -238,7 +238,6 @@ CONFIG_RAMOOPS=m CONFIG_RAW_DRIVER=m CONFIG_REGMAP_I2C=y CONFIG_REGMAP_SPI=y -CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_REISERFS_FS_POSIX_ACL=y @@ -308,27 +307,16 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_SYSV68_PARTITION=y # CONFIG_SYS_HYPERVISOR is not set # CONFIG_TABLET_USB_WACOM is not set -CONFIG_TARGET_CORE=m CONFIG_TASKSTATS=y # CONFIG_TCG_TIS is not set CONFIG_TCG_TPM=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y -CONFIG_TEST_KSTRTOX=m -CONFIG_THERMAL=y CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m -CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m -CONFIG_TPS6105X=m # CONFIG_TPS65010 is not set -CONFIG_TPS6507X=m -CONFIG_TRACE_SINK=m # CONFIG_TRANZPORT is not set -CONFIG_TUN=y CONFIG_TWL4030_CORE=y -CONFIG_TWL4030_MADC=m CONFIG_TWL4030_USB=m -CONFIG_TWL6030_PWM=m -CONFIG_TWL6030_USB=m CONFIG_UIO=m CONFIG_ULTRIX_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 3de1fd3..a3709a4 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -269,7 +269,6 @@ CONFIG_RAW_DRIVER=m CONFIG_RCU_FANOUT=64 CONFIG_REGMAP_I2C=y CONFIG_REGMAP_SPI=y -CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_REISERFS_FS_POSIX_ACL=y @@ -341,27 +340,16 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_SYSV68_PARTITION=y # CONFIG_SYS_HYPERVISOR is not set # CONFIG_TABLET_USB_WACOM is not set -CONFIG_TARGET_CORE=m CONFIG_TASKSTATS=y # CONFIG_TCG_TIS is not set CONFIG_TCG_TPM=y CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_MD5SIG=y -CONFIG_TEST_KSTRTOX=m -CONFIG_THERMAL=y CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m -CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m -CONFIG_TPS6105X=m # CONFIG_TPS65010 is not set -CONFIG_TPS6507X=m -CONFIG_TRACE_SINK=m # CONFIG_TRANZPORT is not set -CONFIG_TUN=y CONFIG_TWL4030_CORE=y -CONFIG_TWL4030_MADC=m CONFIG_TWL4030_USB=m -CONFIG_TWL6030_PWM=m -CONFIG_TWL6030_USB=m CONFIG_UIO=m CONFIG_ULTRIX_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y -- 1.7.9.5