diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-11-21 22:09:56 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-11-21 22:09:56 +0100 |
| commit | 2005519903a556edd592c237c2514be8842ae1d0 (patch) | |
| tree | 90883da0cbe7a3fa4aa7037c2c57301e17029f47 /config-arm-generic | |
| parent | 6e9af8098043d00eb89eb0f088f3a28d4fbd2c25 (diff) | |
| parent | 0617a9a8d0a3662b3bd1851f91e8fc613fed33cc (diff) | |
| download | kernel-4.9.0-0.rc6.git0.1.vanilla.knurd.1.fc24.tar.gz kernel-4.9.0-0.rc6.git0.1.vanilla.knurd.1.fc24.tar.xz kernel-4.9.0-0.rc6.git0.1.vanilla.knurd.1.fc24.zip | |
merge master, reenable iiotoolskernel-4.9.0-0.rc6.git0.1.vanilla.knurd.1.fc26kernel-4.9.0-0.rc6.git0.1.vanilla.knurd.1.fc25kernel-4.9.0-0.rc6.git0.1.vanilla.knurd.1.fc24kernel-4.9.0-0.rc6.git0.1.vanilla.knurd.1.fc23
Diffstat (limited to 'config-arm-generic')
| -rw-r--r-- | config-arm-generic | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config-arm-generic b/config-arm-generic index e13cc6027..f52f5347e 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -172,6 +172,7 @@ CONFIG_SERIAL_MVEBU_CONSOLE=y CONFIG_MVEBU_DEVBUS=y CONFIG_MVEBU_MBUS=y CONFIG_PCI_MVEBU=y +CONFIG_PCI_AARDVARK=y CONFIG_PCIE_ARMADA_8K=y CONFIG_MV_XOR=y CONFIG_CRYPTO_DEV_MV_CESA=m @@ -197,9 +198,9 @@ CONFIG_USB_MV_UDC=m CONFIG_USB_XHCI_MVEBU=m CONFIG_PHY_MVEBU_SATA=y CONFIG_AHCI_MVEBU=m +CONFIG_I2C_PXA=m # CONFIG_CACHE_FEROCEON_L2 is not set # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set -# CONFIG_PCI_AARDVARK is not set # Rockchips CONFIG_ARCH_ROCKCHIP=y |