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-armv7hl-lpae-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-armv7hl-lpae-debug.config')
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 4d5a5298c..dfe2e6df1 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -149,7 +149,7 @@ CONFIG_AIC7XXX_RESET_DELAY_MS=15000 CONFIG_AIX_PARTITION=y # CONFIG_AK09911 is not set # CONFIG_AK8974 is not set -# CONFIG_AK8975 is not set +CONFIG_AK8975=m # CONFIG_AL3320A is not set CONFIG_ALI_FIR=m CONFIG_ALIM1535_WDT=m @@ -675,6 +675,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 @@ -2229,7 +2230,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSE=y -CONFIG_INPUT_MPU3050=m CONFIG_INPUT_PCF50633_PMU=m # CONFIG_INPUT_PCF8574 is not set CONFIG_INPUT_PCSPKR=m @@ -2654,7 +2654,9 @@ CONFIG_KUSER_HELPERS=y CONFIG_KVM_ARM_HOST=y CONFIG_KVM=y CONFIG_KXCJK1013=m -# CONFIG_KXSD9 is not set +CONFIG_KXSD9_I2C=m +CONFIG_KXSD9=m +CONFIG_KXSD9_SPI=m CONFIG_L2TP_DEBUGFS=m CONFIG_L2TP_ETH=m CONFIG_L2TP_IP=m @@ -3006,7 +3008,6 @@ CONFIG_MFD_MAX8997=y # CONFIG_MFD_NVEC is not set # CONFIG_MFD_PALMAS is not set # CONFIG_MFD_PCF50633 is not set -# CONFIG_MFD_PM8921_CORE is not set # CONFIG_MFD_PM8XXX is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_RDC321X is not set @@ -3197,7 +3198,7 @@ CONFIG_MPL115=m CONFIG_MPL3115=m 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 @@ -4048,8 +4049,8 @@ CONFIG_PHY_MVEBU_SATA=y # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set # CONFIG_PHY_QCOM_IPQ806X_SATA is not set -CONFIG_PHY_QCOM_USB_HSIC=m -CONFIG_PHY_QCOM_USB_HS=m +# CONFIG_PHY_QCOM_USB_HSIC is not set +# CONFIG_PHY_QCOM_USB_HS is not set CONFIG_PHY_ROCKCHIP_DP=m CONFIG_PHY_ROCKCHIP_EMMC=m CONFIG_PHY_ROCKCHIP_INNO_USB2=m |