UBUNTU: [Config] standardise CONFIG_INPUT_TOUCHSCREEN

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

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 60ff379..90b6e95 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -145,7 +145,6 @@ CONFIG_IDE_PHISON=m
 CONFIG_IGB=m
 CONFIG_IIO=m
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INTR_REMAP=y
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_HELPER=y

diff --git a/debian.master/config/armel/config.flavour.omap b/debian.master/config/armel/config.flavour.omap
index 406941b..94239c5 100644 (file)
--- a/debian.master/config/armel/config.flavour.omap
+++ b/debian.master/config/armel/config.flavour.omap
@@ -38,7 +38,6 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_HTC_EGPIO=y
 CONFIG_HWMON=y
 CONFIG_HZ=128
-CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_ISDN=y
 # CONFIG_IWMC3200TOP_DEBUGFS is not set
 CONFIG_KEYBOARD_LKKBD=m

diff --git a/debian.master/config/armel/config.flavour.versatile b/debian.master/config/armel/config.flavour.versatile
index 5726e4d..edf749c 100644 (file)
--- a/debian.master/config/armel/config.flavour.versatile
+++ b/debian.master/config/armel/config.flavour.versatile
@@ -38,7 +38,6 @@ CONFIG_HIGHMEM=y
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HWMON is not set
 CONFIG_HZ=100
-# CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_ISDN is not set
 CONFIG_IWMC3200TOP_DEBUGFS=y
 # CONFIG_KEYBOARD_LKKBD is not set

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 4cc23df..579afe5 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2080,6 +2080,7 @@ CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INPUT_TABLET=y
+CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_TWL4030_PWRBUTTON=m
 CONFIG_INPUT_TWL4030_VIBRA=m
 CONFIG_INPUT_UINPUT=y

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index d68e710..8f2f993 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -146,7 +146,6 @@ CONFIG_IDE_PHISON=m
 CONFIG_IGB=m
 CONFIG_IIO=m
 CONFIG_ILLEGAL_POINTER_VALUE=0
-CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_INTR_REMAP is not set
 # CONFIG_IOMMU_API is not set
 CONFIG_IPC_NS=y

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 71e7a6c..7b40f42 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -125,7 +125,6 @@ CONFIG_IDE=y
 # CONFIG_IDE_PHISON is not set
 # CONFIG_IGB is not set
 # CONFIG_IIO is not set
-CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_IOMMU_HELPER=y
 # CONFIG_IPC_NS is not set
 CONFIG_IPMI_HANDLER=m