summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGary King <gking@nvidia.com>2010-01-13 19:14:56 -0800
committerGary King <gking@nvidia.com>2010-01-13 19:14:56 -0800
commit76f8faaaa77f8bc2653e0123ec564085a68855d0 (patch)
tree4d7cfee1507e5f7249e1826b2e5b63d96557f14e /arch
parent1322a0966db4e854ee6582eea738315be8888556 (diff)
tegra: enable MODVERSIONS for Harmony & Whistler Android
Change-Id: I2c67820e78bffe3139c940654e28eaa203a734b7
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/tegra_harmony_android_defconfig4
-rw-r--r--arch/arm/configs/tegra_whistler_android_defconfig7
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/configs/tegra_harmony_android_defconfig b/arch/arm/configs/tegra_harmony_android_defconfig
index f14c6914155e..4d27d74bbfce 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.29
-# Wed Jan 13 16:49:18 2010
+# Wed Jan 13 19:10:42 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -105,7 +105,7 @@ CONFIG_MODULES=y
# CONFIG_MODULE_FORCE_LOAD is not set
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
+CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
diff --git a/arch/arm/configs/tegra_whistler_android_defconfig b/arch/arm/configs/tegra_whistler_android_defconfig
index 3152524f3346..76966576e0ee 100644
--- a/arch/arm/configs/tegra_whistler_android_defconfig
+++ b/arch/arm/configs/tegra_whistler_android_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29
-# Tue Dec 22 17:39:01 2009
+# Wed Jan 13 19:11:24 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -105,7 +105,7 @@ CONFIG_MODULES=y
# CONFIG_MODULE_FORCE_LOAD is not set
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
+CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
@@ -184,6 +184,7 @@ CONFIG_TEGRA_SYSTEM_DMA=y
CONFIG_TEGRA_ODM_RFKILL=y
# CONFIG_TEGRA_NVEC is not set
CONFIG_TEGRA_ODM_VIBRATE=y
+# CONFIG_TEGRA_PCI is not set
# CONFIG_TEGRA_ODM_HARMONY is not set
CONFIG_TEGRA_ODM_WHISTLER=y
# CONFIG_TEGRA_ODM_CONCORDE is not set
@@ -787,7 +788,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=1
# Non-8250 serial port support
#
CONFIG_SERIAL_TEGRA_DDK=y
-# CONFIG_SERIAL_TEGRA is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
@@ -997,6 +997,7 @@ CONFIG_USB_HID=y
# Special HID drivers
#
CONFIG_USB_KEYBOARD_USES_COMMON_NAME=y
+CONFIG_USB_KEYBOARD_COMMON_NAME="usb_keyboard_us102"
CONFIG_HID_COMPAT=y
# CONFIG_HID_A4TECH is not set
# CONFIG_HID_APPLE is not set