diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-03 18:32:23 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-07-03 18:32:23 +0200 |
| commit | 5dd43d4636c681e068e7210e7e0651f5ad270191 (patch) | |
| tree | 05af6b5be9aadc1034a9fc68661d8692c0e347e8 /kernel-s390x-debug.config | |
| parent | ee3ff4d64d3a6d6f8665b5397fdba17adc85bfa9 (diff) | |
| parent | 4212002e48fd1ef3cb5c3292ad99cf07bc26406c (diff) | |
| download | kernel-5dd43d4636c681e068e7210e7e0651f5ad270191.tar.gz kernel-5dd43d4636c681e068e7210e7e0651f5ad270191.tar.xz kernel-5dd43d4636c681e068e7210e7e0651f5ad270191.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-1.vanilla.knurd.1.fc27kernel-4.12.0-1.vanilla.knurd.1.fc26kernel-4.12.0-1.vanilla.knurd.1.fc25kernel-4.12.0-1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-s390x-debug.config')
| -rw-r--r-- | kernel-s390x-debug.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 8aa42f5f0..d3107b82b 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -511,6 +511,7 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_MRVL=y CONFIG_BT_HCIUART_NOKIA=m CONFIG_BT_HCIUART_QCA=y +CONFIG_BT_HCIUART_SERDEV=y CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m CONFIG_BT_HS=y @@ -1880,7 +1881,6 @@ CONFIG_INPUT_LEDS=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_MPU3050=m CONFIG_INPUT_PCF50633_PMU=m # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m @@ -2766,7 +2766,7 @@ CONFIG_MOVABLE_NODE=y # CONFIG_MPL3115 is not set CONFIG_MPLS_IPTUNNEL=m CONFIG_MPLS_ROUTING=m -# CONFIG_MPU3050_I2C is not set +CONFIG_MPU3050_I2C=m CONFIG_MQ_IOSCHED_DEADLINE=y CONFIG_MQ_IOSCHED_KYBER=m # CONFIG_MS5611 is not set |