aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-12-29 12:17:19 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-12-29 12:17:19 +0000
commit60f90ae24d36d4ef1facebcf0b62b91f7f93c911 (patch)
treefb128b3be5a4949defe15ec587d302e964c27248 /arch
parentfef54d6ffdd05cf58ca61bb0d36fa749e2b676e7 (diff)
config-gta02-no-gta03-ts.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/gta02-moredrivers-defconfig4
-rw-r--r--arch/arm/configs/gta02-packaging-defconfig1
-rw-r--r--arch/arm/configs/gta03_defconfig1
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig
index 9294b536473..1e69288120b 100644
--- a/arch/arm/configs/gta02-moredrivers-defconfig
+++ b/arch/arm/configs/gta02-moredrivers-defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.28-rc4
-# Wed Dec 10 10:58:53 2008
+# Mon Dec 29 12:13:48 2008
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -194,6 +194,7 @@ CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
# CONFIG_S3C2410_PM_CHECK is not set
CONFIG_S3C_LOWLEVEL_UART_PORT=2
CONFIG_S3C_GPIO_SPACE=0
+CONFIG_S3C_GPIO_TRACK=y
#
# S3C2400 Machines
@@ -998,6 +999,7 @@ CONFIG_TOUCHSCREEN_S3C2410=y
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_PCAP7200 is not set
CONFIG_INPUT_MISC=y
# CONFIG_INPUT_ATI_REMOTE is not set
# CONFIG_INPUT_ATI_REMOTE2 is not set
diff --git a/arch/arm/configs/gta02-packaging-defconfig b/arch/arm/configs/gta02-packaging-defconfig
index 02560223722..b44557d4d74 100644
--- a/arch/arm/configs/gta02-packaging-defconfig
+++ b/arch/arm/configs/gta02-packaging-defconfig
@@ -1002,6 +1002,7 @@ CONFIG_TOUCHSCREEN_S3C2410=y
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_PCAP7200 is not set
CONFIG_INPUT_MISC=y
# CONFIG_INPUT_ATI_REMOTE is not set
# CONFIG_INPUT_ATI_REMOTE2 is not set
diff --git a/arch/arm/configs/gta03_defconfig b/arch/arm/configs/gta03_defconfig
index 9e66f4eee6e..3263eac9d6c 100644
--- a/arch/arm/configs/gta03_defconfig
+++ b/arch/arm/configs/gta03_defconfig
@@ -712,6 +712,7 @@ CONFIG_TOUCHSCREEN_FILTER_MEAN=y
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
CONFIG_INPUT_MISC=y
+CONFIG_TOUCHSCREEN_PCAP7200=y
# CONFIG_INPUT_ATI_REMOTE is not set
# CONFIG_INPUT_ATI_REMOTE2 is not set
# CONFIG_INPUT_KEYSPAN_REMOTE is not set