[kernel] move common CONFIG_TOUCHSCREEN entries to generic

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17943 3c298f89-4303-0410-b956-a3cf2f4a3e73

7 files changed, 49 insertions, 57 deletions

diff --git a/target/linux/generic-2.6/config-2.6.21 b/target/linux/generic-2.6/config-2.6.21
index 733363c5c..7d484bc3f 100644
--- a/target/linux/generic-2.6/config-2.6.21
+++ b/target/linux/generic-2.6/config-2.6.21
@@ -1478,6 +1478,14 @@ CONFIG_TEXTSEARCH=y
 # CONFIG_TMD_HERMES is not set
 # CONFIG_TMPFS_POSIX_ACL is not set
 CONFIG_TMPFS=y
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_TR is not set
 # CONFIG_TUNER_3036 is not set
diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index b2910d0f5..e362e78b7 100644
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -2099,6 +2099,25 @@ CONFIG_TIMERFD=y
 # CONFIG_TMD_HERMES is not set
 # CONFIG_TMPFS_POSIX_ACL is not set
 CONFIG_TMPFS=y
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_FILTER is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_S3C2410 is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
 # CONFIG_TPS65010 is not set
 # CONFIG_TRACE_BRANCH_PROFILING is not set
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
index c877c1b83..fe496ed55 100644
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -2146,6 +2146,28 @@ CONFIG_TIMERFD=y
 # CONFIG_TMD_HERMES is not set
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_FILTER is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_S3C2410 is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
 # CONFIG_TPS65010 is not set
 # CONFIG_TR is not set
 # CONFIG_TRACE_BRANCH_PROFILING is not set
diff --git a/target/linux/goldfish/config-2.6.30 b/target/linux/goldfish/config-2.6.30
index 71a4cfe62..d6b98a683 100644
--- a/target/linux/goldfish/config-2.6.30
+++ b/target/linux/goldfish/config-2.6.30
@@ -189,18 +189,6 @@ CONFIG_SUSPEND_FREEZER=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TICK_ONESHOT=y
 # CONFIG_TIMER_STATS is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_UBIFS_FS is not set
 CONFIG_UEVENT_HELPER_PATH=""
diff --git a/target/linux/pxa/config-default b/target/linux/pxa/config-default
index 355e16ee8..08083c758 100644
--- a/target/linux/pxa/config-default
+++ b/target/linux/pxa/config-default
@@ -204,13 +204,6 @@ CONFIG_SND_SOC_AC97_CODEC=m
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 CONFIG_TOUCHSCREEN_UCB1400=m
 # CONFIG_UDF_FS is not set
 CONFIG_UID16=y
diff --git a/target/linux/s3c24xx/config-2.6.30 b/target/linux/s3c24xx/config-2.6.30
index 16b39d40b..e7799df61 100644
--- a/target/linux/s3c24xx/config-2.6.30
+++ b/target/linux/s3c24xx/config-2.6.30
@@ -364,31 +364,13 @@ CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TCP_MD5SIG=y
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
 CONFIG_TOUCHSCREEN_FILTER=y
 CONFIG_TOUCHSCREEN_FILTER_GROUP=y
 CONFIG_TOUCHSCREEN_FILTER_LINEAR=y
 CONFIG_TOUCHSCREEN_FILTER_MEAN=y
 CONFIG_TOUCHSCREEN_FILTER_MEDIAN=y
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
 CONFIG_TOUCHSCREEN_S3C2410=y
 # CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
 CONFIG_TRACING_SUPPORT=y
 CONFIG_UID16=y
 CONFIG_UNEVICTABLE_LRU=y
diff --git a/target/linux/s3c24xx/config-2.6.31 b/target/linux/s3c24xx/config-2.6.31
index eb0d952f6..4dae6708e 100644
--- a/target/linux/s3c24xx/config-2.6.31
+++ b/target/linux/s3c24xx/config-2.6.31
@@ -377,33 +377,13 @@ CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TCP_MD5SIG=y
-# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
-# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_EETI is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
 CONFIG_TOUCHSCREEN_FILTER=y
 CONFIG_TOUCHSCREEN_FILTER_GROUP=y
 CONFIG_TOUCHSCREEN_FILTER_LINEAR=y
 CONFIG_TOUCHSCREEN_FILTER_MEAN=y
 CONFIG_TOUCHSCREEN_FILTER_MEDIAN=y
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
 CONFIG_TOUCHSCREEN_S3C2410=y
 # CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_W90X900 is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 CONFIG_UID16=y