diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-27 07:28:07 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-27 07:28:07 +0200 |
| commit | 1850930c15c76d2c41414935e2be3d6b46011206 (patch) | |
| tree | 6d81f2c08565866be1a33d8decc1b47c150dbe0d /kernel-s390x-debug.config | |
| parent | 92ef74803ebd37d9d461c4391e6cf6f8a7ef7c0e (diff) | |
| parent | b8330ccb3e6be042c8a4db5c21283e86bfd147b1 (diff) | |
| download | kernel-1850930c15c76d2c41414935e2be3d6b46011206.tar.gz kernel-1850930c15c76d2c41414935e2be3d6b46011206.tar.xz kernel-1850930c15c76d2c41414935e2be3d6b46011206.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc7.git0.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc7.git0.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc7.git0.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc7.git0.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-s390x-debug.config')
| -rw-r--r-- | kernel-s390x-debug.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 37e00a8bd..0901700cb 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -520,7 +520,6 @@ CONFIG_BT_LE=y CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m CONFIG_BT_QCA=m -# CONFIG_BT_QCOMSMD is not set CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y # CONFIG_BTRFS_ASSERT is not set @@ -3533,7 +3532,7 @@ CONFIG_PHYLIB=m CONFIG_PID_NS=y # CONFIG_PINCONF is not set # CONFIG_PINCTRL is not set -CONFIG_PINCTRL_MSM8994=m +# CONFIG_PINCTRL_MSM8994 is not set # CONFIG_PINCTRL_SX150X is not set # CONFIG_PINCTRL_TI_IODELAY is not set # CONFIG_PINMUX is not set |