diff options
| author | Gerrit Code Review <gerrit2@git-master.nvidia.com> | 2010-01-07 08:52:49 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@git-master.nvidia.com> | 2010-01-07 08:52:49 +0200 |
| commit | 083ec97aeb43fefb8e80ccd5daf4fc15e47f9a51 (patch) | |
| tree | 90a7953105e5a16b07b1845c6f54de1580e5a031 /arch | |
| parent | 58dd78dcfdcbe2db0ce27620c4c13c836e905289 (diff) | |
| parent | 06369de60fa4746471a58d3d716483b466dbc13f (diff) | |
Merge change I9e3fac88 into android-tegra-2.6.29
* changes:
hid: add a config to force all usb keyboards to return the same name.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/tegra_harmony_android_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/tegra_whistler_android_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra_harmony_android_defconfig b/arch/arm/configs/tegra_harmony_android_defconfig index e628293f031a..400e2746005c 100644 --- a/arch/arm/configs/tegra_harmony_android_defconfig +++ b/arch/arm/configs/tegra_harmony_android_defconfig @@ -1006,6 +1006,7 @@ CONFIG_USB_HID=y # # Special HID drivers # +CONFIG_USB_KEYBOARD_USES_COMMON_NAME=y CONFIG_HID_COMPAT=y # CONFIG_HID_A4TECH is not set # CONFIG_HID_APPLE is not set diff --git a/arch/arm/configs/tegra_whistler_android_defconfig b/arch/arm/configs/tegra_whistler_android_defconfig index 49d8788b36c8..3152524f3346 100644 --- a/arch/arm/configs/tegra_whistler_android_defconfig +++ b/arch/arm/configs/tegra_whistler_android_defconfig @@ -996,6 +996,7 @@ CONFIG_USB_HID=y # # Special HID drivers # +CONFIG_USB_KEYBOARD_USES_COMMON_NAME=y CONFIG_HID_COMPAT=y # CONFIG_HID_A4TECH is not set # CONFIG_HID_APPLE is not set |