summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorVenu Byravarasu <vbyravarasu@nvidia.com>2010-06-23 14:46:51 +0530
committerGary King <gking@nvidia.com>2010-06-28 20:29:04 -0700
commitd563271ec962dcb8ef677c45ff63e6c016cdb25a (patch)
tree6d146392827f067948235f8c9dd6d4bfb806a074 /arch/arm/configs
parenta842bb9573d6f5b3caeb38ec61a5e8f63213d544 (diff)
[ARM] harmony: enable INPUT_TEGRA_ODM_ACCEL
Enabling CONFIG_INPUT_TEGRA_ODM_ACCEL on 2.6.32 Change-Id: I9bce1de7f498d747b4a6b2f61e70118cfbcb932c Reviewed-on: http://git-master/r/2745 Tested-by: Venu Byravarasu <vbyravarasu@nvidia.com> Reviewed-by: Gary King <gking@nvidia.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/tegra_harmony_android_defconfig21
1 files changed, 18 insertions, 3 deletions
diff --git a/arch/arm/configs/tegra_harmony_android_defconfig b/arch/arm/configs/tegra_harmony_android_defconfig
index 6d8e0887daee..4719682e25ea 100644
--- a/arch/arm/configs/tegra_harmony_android_defconfig
+++ b/arch/arm/configs/tegra_harmony_android_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.9
-# Fri Jun 18 15:29:24 2010
+# Wed Jun 23 14:37:19 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -21,6 +21,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
CONFIG_ARCH_HAS_CPUFREQ=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
CONFIG_ARCH_PROVIDES_UDELAY=y
CONFIG_VECTORS_BASE=0xffff0000
@@ -208,6 +209,8 @@ CONFIG_ARCH_TEGRA=y
#
CONFIG_ARCH_TEGRA_2x_SOC=y
CONFIG_MACH_TEGRA_GENERIC=y
+CONFIG_MACH_HARMONY=y
+CONFIG_MACH_VENTANA=y
CONFIG_TEGRA_ODM_KIT=y
CONFIG_TEGRA_DEBUG_UART_NONE=y
# CONFIG_TEGRA_DEBUG_UARTA is not set
@@ -268,6 +271,7 @@ CONFIG_TEGRA_ERRATA_657451=y
# CONFIG_ARM_ERRATA_458693 is not set
# CONFIG_ARM_ERRATA_460075 is not set
CONFIG_ARM_GIC=y
+CONFIG_DMABOUNCE=y
CONFIG_COMMON_CLKDEV=y
#
@@ -319,7 +323,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
+CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
CONFIG_HAVE_MLOCK=y
@@ -916,8 +920,19 @@ CONFIG_TOUCHSCREEN_USB_E2I=y
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
# CONFIG_TOUCHSCREEN_TSC2007 is not set
# CONFIG_TOUCHSCREEN_W90X900 is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYCHORD is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+# CONFIG_INPUT_UINPUT is not set
# CONFIG_INPUT_GPIO is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+CONFIG_INPUT_TEGRA_ODM_ACCEL=y
+# CONFIG_INPUT_TEGRA_ODM_SCROLL is not set
#
# Hardware I/O ports