diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-20 19:13:38 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-20 19:13:38 +0100 |
commit | 8254b9e89569e42582894c7c8756a71bc84cf9ee (patch) | |
tree | 3a0f64be1de03c637d6671173e93417982cea510 /kernel-armv7hl-lpae-debug.config | |
parent | 89fdb98ea38a73043e91af208ff93c5f86addce2 (diff) | |
parent | 88fc0e2f65816ea00498a0302a7fd5f54695ea9c (diff) | |
download | kernel-8254b9e89569e42582894c7c8756a71bc84cf9ee.tar.gz kernel-8254b9e89569e42582894c7c8756a71bc84cf9ee.tar.xz kernel-8254b9e89569e42582894c7c8756a71bc84cf9ee.zip |
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc3.git0.1.vanilla.knurd.1.fc27kernel-4.11.0-0.rc3.git0.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc3.git0.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc3.git0.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-armv7hl-lpae-debug.config')
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index ed4a73696..5732365d5 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1435,6 +1435,7 @@ CONFIG_DWMAC_GENERIC=m # CONFIG_DWMAC_IPQ806X is not set CONFIG_DWMAC_MESON=m CONFIG_DWMAC_ROCKCHIP=m +CONFIG_DWMAC_SUN8I=m CONFIG_DWMAC_SUNXI=m CONFIG_DW_WATCHDOG=m CONFIG_DYNAMIC_DEBUG=y @@ -5426,7 +5427,6 @@ CONFIG_SUN5I_CCU=y CONFIG_SUN6I_A31_CCU=y CONFIG_SUN8I_A23_CCU=y CONFIG_SUN8I_A33_CCU=y -CONFIG_SUN8I_EMAC=m CONFIG_SUN8I_H3_CCU=y CONFIG_SUN8I_V3S_CCU=y CONFIG_SUN9I_A80_CCU=y |