From patchwork Mon Apr 2 19:29:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/7] UBUNTU: [Config] sync input drivers with master From: Paolo Pisati X-Patchwork-Id: 150236 Message-Id: <1333394973-14387-4-git-send-email-paolo.pisati@canonical.com> To: kernel-team@lists.ubuntu.com Date: Mon, 2 Apr 2012 21:29:28 +0200 Signed-off-by: Paolo Pisati --- debian.ti-omap4/config/config.common.ubuntu | 29 ++++++++++++++------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu index c024c15..c6ff06f 100644 --- a/debian.ti-omap4/config/config.common.ubuntu +++ b/debian.ti-omap4/config/config.common.ubuntu @@ -1369,8 +1369,8 @@ CONFIG_INIT_PASS_ALL_PARAMS=y # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set CONFIG_INOTIFY_USER=y CONFIG_INPUT=y -# CONFIG_INPUT_88PM860X_ONKEY is not set -# CONFIG_INPUT_AB8500_PONKEY is not set +CONFIG_INPUT_88PM860X_ONKEY=m +CONFIG_INPUT_AB8500_PONKEY=m CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m @@ -1378,7 +1378,7 @@ CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m CONFIG_INPUT_ADXL34X_SPI=m CONFIG_INPUT_ATI_REMOTE2=m -# CONFIG_INPUT_BMA150 is not set +CONFIG_INPUT_BMA150=m CONFIG_INPUT_CM109=m CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m @@ -1390,31 +1390,32 @@ CONFIG_INPUT_JOYDEV=m CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_KEYBOARD=y CONFIG_INPUT_KEYSPAN_REMOTE=m -# CONFIG_INPUT_KXTJ9 is not set -# CONFIG_INPUT_MAX8925_ONKEY is not set -# CONFIG_INPUT_MC13783_PWRBUTTON is not set +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set +CONFIG_INPUT_MAX8925_ONKEY=m +CONFIG_INPUT_MC13783_PWRBUTTON=m CONFIG_INPUT_MISC=y -# CONFIG_INPUT_MMA8450 is not set +CONFIG_INPUT_MMA8450=m CONFIG_INPUT_MOUSE=y CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -# CONFIG_INPUT_MPU3050 is not set -# CONFIG_INPUT_PCAP is not set +CONFIG_INPUT_MPU3050=m +CONFIG_INPUT_PCAP=m CONFIG_INPUT_PCF50633_PMU=m CONFIG_INPUT_PCF8574=m CONFIG_INPUT_POLLDEV=m CONFIG_INPUT_POWERMATE=m -# CONFIG_INPUT_PWM_BEEPER is not set +CONFIG_INPUT_PWM_BEEPER=m CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_TABLET=y CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_TWL4030_PWRBUTTON=y -# CONFIG_INPUT_TWL4030_VIBRA is not set -# CONFIG_INPUT_TWL6040_VIBRA is not set +CONFIG_INPUT_TWL4030_PWRBUTTON=m +CONFIG_INPUT_TWL4030_VIBRA=m +CONFIG_INPUT_TWL6040_VIBRA=m CONFIG_INPUT_UINPUT=y -# CONFIG_INPUT_WM831X_ON is not set +CONFIG_INPUT_WM831X_ON=m CONFIG_INPUT_YEALINK=m CONFIG_IOMMU_API=y CONFIG_IOMMU_SUPPORT=y