diff options
author | Bharat Nihalani <bnihalani@nvidia.com> | 2011-07-04 13:03:35 +0530 |
---|---|---|
committer | Manish Tuteja <mtuteja@nvidia.com> | 2011-07-05 10:36:04 -0700 |
commit | db34c987d643ad1a946390335f95e0ec5c0f325b (patch) | |
tree | 51516e79f8f6448b69a4a9214cb63f05a0f17a87 | |
parent | 5115ea5375912d9c35487d3d3b6e51c3c81be25c (diff) |
ARM: defconfig: Disable INPUT_ALPS_GPIO_SCROLLWHEEL
Scrollwheel driver is not needed on phone platforms since we already
have touch-screen on it.
Hence the scrollwheel driver on Whistler is disabled; it was also
causing problems in suspend-resume use-cases.
Bug 841686
Change-Id: I730ba3fb126619ed81caad6f801b1d8876d90d39
Reviewed-on: http://git-master/r/39517
Reviewed-by: Puneet Saxena <puneets@nvidia.com>
Tested-by: Puneet Saxena <puneets@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
-rw-r--r-- | arch/arm/configs/tegra_whistler_android_defconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/configs/tegra_whistler_android_defconfig b/arch/arm/configs/tegra_whistler_android_defconfig index b9f257550417..0f9aaf85484b 100644 --- a/arch/arm/configs/tegra_whistler_android_defconfig +++ b/arch/arm/configs/tegra_whistler_android_defconfig @@ -213,7 +213,6 @@ CONFIG_INPUT_UINPUT=y CONFIG_INPUT_GPIO=y CONFIG_INPUT_ADXL34X=y # CONFIG_INPUT_ADXL34X_SPI is not set -CONFIG_INPUT_ALPS_GPIO_SCROLLWHEEL=y # CONFIG_SERIO is not set # CONFIG_VT is not set CONFIG_SERIAL_8250=y @@ -246,8 +245,8 @@ CONFIG_VIDEO_DEV=y # CONFIG_MEDIA_TUNER_CUSTOMISE is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_OV5650=y -CONFIG_VIDEO_AD5820=y CONFIG_VIDEO_SOC380=y +CONFIG_VIDEO_AD5820=y CONFIG_USB_VIDEO_CLASS=y # CONFIG_USB_GSPCA is not set CONFIG_VIDEO_OUTPUT_CONTROL=y @@ -288,7 +287,6 @@ CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_EMBEDDED_SDIO=y CONFIG_MMC_PARANOID_SD_INIT=y # CONFIG_MMC_BLOCK_BOUNCE is not set -# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_TEGRA=y CONFIG_SWITCH=y |