summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Collins <rcollins@nvidia.com>2010-11-30 15:46:25 -0800
committerVarun Colbert <vcolbert@nvidia.com>2010-12-13 10:37:54 -0800
commit5cea6270cdac231fe9efbbd898bf8883418d65dd (patch)
tree2110902ceb4f3d2f6864478b96c77fc5adcb2929
parentc1977e5723a7d4bb171faa164d8d0d972c631a74 (diff)
[ARM/tegra] ventana: Enable PANJIT & ATMEL touchscreen
Enable CONFIG_TOUCHSCREEN_PANJIT_I2C and CONFIG_TOUCHSCREEN_ATMEL_MT_T9. Disable CONFIG_TOUCHSCREEN_TEGRA_ODM. Change-Id: I711f273add8c73be88b810d28049e53e6ad01a92 Reviewed-on: http://git-master/r/11726 Reviewed-by: Robert R Collins <rcollins@nvidia.com> Tested-by: Robert R Collins <rcollins@nvidia.com> Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
-rw-r--r--[-rwxr-xr-x]arch/arm/configs/tegra_ventana_android_defconfig18
1 files changed, 6 insertions, 12 deletions
diff --git a/arch/arm/configs/tegra_ventana_android_defconfig b/arch/arm/configs/tegra_ventana_android_defconfig
index 2f5909dab489..8d63c1ffd1e4 100755..100644
--- a/arch/arm/configs/tegra_ventana_android_defconfig
+++ b/arch/arm/configs/tegra_ventana_android_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.9
-# Wed Nov 10 12:17:09 2010
+# Tue Nov 30 14:38:09 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -58,16 +58,8 @@ CONFIG_LOG_BUF_SHIFT=17
CONFIG_GROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
# CONFIG_RT_GROUP_SCHED is not set
-# CONFIG_USER_SCHED is not set
-CONFIG_CGROUP_SCHED=y
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-# CONFIG_CGROUP_NS is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-# CONFIG_CPUSETS is not set
-CONFIG_CGROUP_CPUACCT=y
-# CONFIG_RESOURCE_COUNTERS is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
# CONFIG_SYSFS_DEPRECATED_V2 is not set
CONFIG_RELAY=y
# CONFIG_NAMESPACES is not set
@@ -908,9 +900,11 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_MK712 is not set
# CONFIG_TOUCHSCREEN_PENMOUNT is not set
# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI is not set
-CONFIG_TOUCHSCREEN_TEGRA_ODM=y
+# CONFIG_TOUCHSCREEN_TEGRA_ODM is not set
# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+CONFIG_TOUCHSCREEN_PANJIT_I2C=y
+CONFIG_TOUCHSCREEN_ATMEL_MT_T9=y
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
# CONFIG_TOUCHSCREEN_TSC2007 is not set