summaryrefslogtreecommitdiffstats
path: root/config-powerpc64-generic
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-01-16 20:17:22 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2017-01-16 20:17:22 +0100
commitca75f110bc88c5fae16d2eb326d6b660966ed9a1 (patch)
treed73f747c943110665afb8442d66516be31364429 /config-powerpc64-generic
parent11694b34819e3f7559a12f68f6c1b06fb9e0b977 (diff)
parent6f694dee179a7fb29f4fa2f9d47edd3a2ba9a73d (diff)
downloadkernel-4.9.4-100.vanilla.knurd.1.fc24.tar.gz
kernel-4.9.4-100.vanilla.knurd.1.fc24.tar.xz
kernel-4.9.4-100.vanilla.knurd.1.fc24.zip
Merge remote-tracking branch 'origin/f24' into f24-user-thl-vanilla-fedorakernel-4.9.4-100.vanilla.knurd.1.fc24
Diffstat (limited to 'config-powerpc64-generic')
-rw-r--r--config-powerpc64-generic8
1 files changed, 1 insertions, 7 deletions
diff --git a/config-powerpc64-generic b/config-powerpc64-generic
index fcd3a49a4..d67acd95a 100644
--- a/config-powerpc64-generic
+++ b/config-powerpc64-generic
@@ -148,7 +148,6 @@ CONFIG_IO_EVENT_IRQ=y
# CONFIG_RTC is not set
# CONFIG_GEN_RTC is not set
-# CONFIG_GEN_RTC_X is not set
CONFIG_RTC_DRV_GENERIC=y
# CONFIG_CMDLINE_BOOL is not set
@@ -184,6 +183,7 @@ CONFIG_FB_MATROX_G=y
# CONFIG_FB_VGA16 is not set
# CONFIG_FB_ATY128 is not set
# CONFIG_FB_ATY is not set
+# CONFIG_AGP is not set
# CONFIG_SND_SOC is not set
# CONFIG_INPUT_PCSPKR is not set
@@ -222,11 +222,6 @@ CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
# CONFIG_MACINTOSH_DRIVERS is not set
# CONFIG_EDAC_CPC925 is not set
-
-CONFIG_EDAC=y
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_LEGACY_SYSFS=y
-
# CONFIG_AXON_RAM is not set
CONFIG_SUSPEND_FREEZER=y
@@ -310,7 +305,6 @@ CONFIG_PPC_EMULATED_STATS=y
CONFIG_SWIOTLB=y
CONFIG_PPC_DISABLE_WERROR=y
-# CONFIG_STRICT_MM_TYPECHECKS is not set
# CONFIG_XILINX_LL_TEMAC is not set
# CONFIG_XILINX_EMACLITE is not set