diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-12-21 13:30:33 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-12-21 13:30:33 +0100 |
| commit | 6b9121d64ab2480f41622350c90ec5119738c67a (patch) | |
| tree | 8a6579fe317c71b074f0f521907e0731c08221e3 /kernel-i686-PAE.config | |
| parent | a76e9e81d1ac7fb14551a839a62bbdf5967cee4c (diff) | |
| parent | dd50066e0b3e43d5b6c9b111ef31fc9ae5ca8d6d (diff) | |
| download | kernel-6b9121d64ab2480f41622350c90ec5119738c67a.tar.gz kernel-6b9121d64ab2480f41622350c90ec5119738c67a.tar.xz kernel-6b9121d64ab2480f41622350c90ec5119738c67a.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc0.git6.1.vanilla.knurd.1.fc26kernel-4.10.0-0.rc0.git6.1.vanilla.knurd.1.fc25kernel-4.10.0-0.rc0.git6.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-i686-PAE.config')
| -rw-r--r-- | kernel-i686-PAE.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 109650fea..838de57ec 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -222,7 +222,6 @@ CONFIG_APPLE_PROPERTIES=y # CONFIG_APPLICOM is not set CONFIG_AQUANTIA_PHY=m CONFIG_AR5523=m -CONFIG_ARC_EMAC=m # CONFIG_ARCH_TEGRA_186_SOC is not set # CONFIG_ARCNET is not set # CONFIG_ARM64_PTDUMP is not set @@ -2763,7 +2762,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_88PM805 is not set # CONFIG_MFD_88PM860X is not set # CONFIG_MFD_AAT2870_CORE is not set -# CONFIG_MFD_AC100 is not set # CONFIG_MFD_ACT8945A is not set # CONFIG_MFD_ARIZONA_I2C is not set # CONFIG_MFD_ARIZONA is not set @@ -2828,6 +2826,7 @@ CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SM501=m # CONFIG_MFD_SMSC is not set # CONFIG_MFD_STMPE is not set +CONFIG_MFD_SUN4I_GPADC=m # CONFIG_MFD_SYSCON is not set # CONFIG_MFD_TC3589X is not set # CONFIG_MFD_TC6393XB is not set |