diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-29 18:19:40 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-29 18:19:40 +0200 |
commit | 0b6aeabaff72aa9edb4a21aea7cd4adabe727b48 (patch) | |
tree | 3db25ca32b4c5f048d6873ec55bdc37ce99dbb6c /kernel-ppc64-debug.config | |
parent | 13e07c40e1d078220f3ba981d8825c7e95b2fdfa (diff) | |
parent | d882602b3c4e5f584850bcbba9129758d47e892f (diff) | |
download | kernel-0b6aeabaff72aa9edb4a21aea7cd4adabe727b48.tar.gz kernel-0b6aeabaff72aa9edb4a21aea7cd4adabe727b48.tar.xz kernel-0b6aeabaff72aa9edb4a21aea7cd4adabe727b48.zip |
Merge remote-tracking branch 'origin/f26' into f26-user-thl-vanilla-fedorakernel-4.11.8-300.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-ppc64-debug.config')
-rw-r--r-- | kernel-ppc64-debug.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 56d7caaf2..39b92b8a2 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -557,7 +557,6 @@ CONFIG_BT=m 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 @@ -3602,7 +3601,7 @@ CONFIG_PHYLIB=y 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 |