summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-03-18 13:10:43 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-03-18 13:10:43 -0400
commit1dea4eb579f8656449b31372767cfb5910b16ba3 (patch)
tree355497c8f96ebbf33068234af9618554efff900c /config-generic
parent8b7fda18c9ae7c1c5fc3be129f52798752a3bf24 (diff)
downloadkernel-1dea4eb579f8656449b31372767cfb5910b16ba3.tar.gz
kernel-1dea4eb579f8656449b31372767cfb5910b16ba3.tar.xz
kernel-1dea4eb579f8656449b31372767cfb5910b16ba3.zip
Linux v4.5-4071-g10fdfee7f7fd
- input, livepatching, trivial, hid, gpio, m68knommu, arm64, selftest merges
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic19
1 files changed, 18 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 54ded868e..b639eee04 100644
--- a/config-generic
+++ b/config-generic
@@ -2542,6 +2542,7 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
# CONFIG_TOUCHSCREEN_FT6236 is not set
# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
# CONFIG_TOUCHSCREEN_TSC2004 is not set
+# CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
CONFIG_INPUT_MISC=y
CONFIG_INPUT_E3X0_BUTTON=m
@@ -2566,6 +2567,13 @@ CONFIG_INPUT_MPU3050=m
CONFIG_INPUT_KXTJ9=m
# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
+CONFIG_RMI4_CORE=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+CONFIG_RMI4_SPI=m
+
#
# Character devices
#
@@ -4083,6 +4091,7 @@ CONFIG_HID_APPLEIR=m
CONFIG_HID_LENOVO=m
CONFIG_HID_CORSAIR=m
CONFIG_HID_GFRM=m
+CONFIG_HID_CMEDIA=m
#
# USB Imaging devices
@@ -4432,6 +4441,8 @@ CONFIG_MFD_VIPERBOARD=m
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_SI476X_CORE is not set
# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS65912_I2C is not set
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_DLN2 is not set
@@ -4441,7 +4452,6 @@ CONFIG_MFD_VIPERBOARD=m
# CONFIG_MFD_TPS65218 is not set
# CONFIG_MFD_WM831X_SPI is not set
# CONFIG_MFD_ARIZONA_SPI is not set
-# CONFIG_MFD_TPS65912_SPI is not set
# CONFIG_MFD_MC13XXX_SPI is not set
# CONFIG_MFD_DA9052_SPI is not set
# CONFIG_MFD_MENF21BMC is not set
@@ -5768,6 +5778,13 @@ CONFIG_GPIO_VIPERBOARD=m
# CONFIG_GPIO_AMDPT is not set
# CONFIG_GPIO_104_IDIO_16 is not set
# CONFIG_GPIO_IT87 is not set
+# CONFIG_GPIO_TPIC2810 is not set
+# CONFIG_GPIO_MPC8XXX is not set
+# CONFIG_GPIO_PISOSR is not set
+# CONFIG_GPIO_TS4800 is not set
+# CONFIG_GPIO_TPS65218 is not set
+# CONFIG_GPIO_104_DIO_48E is not set
+# CONFIG_GPIO_WS16C48 is not set
# FIXME: Why?