diff options
author | Chris Zankel <chris@zankel.net> | 2015-04-14 03:51:35 +0000 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2015-04-14 03:51:35 +0000 |
commit | 7ead5b7e4a3cf4a16579a8f164022345b93fe972 (patch) | |
tree | 0a9b9497f53d1593c9e2ac197b2e686ea74a9975 /arch/powerpc/configs/40x/klondike_defconfig | |
parent | 834a316eeebcb75316c0a7d9088fa638c52dc584 (diff) | |
parent | 39a8804455fb23f09157341d3ba7db6d7ae6ee76 (diff) |
Merge tag 'v4.0' into for_next
Linux 4.0
Diffstat (limited to 'arch/powerpc/configs/40x/klondike_defconfig')
-rw-r--r-- | arch/powerpc/configs/40x/klondike_defconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/configs/40x/klondike_defconfig b/arch/powerpc/configs/40x/klondike_defconfig index c0d228dc73dc..e2036b7c7edb 100644 --- a/arch/powerpc/configs/40x/klondike_defconfig +++ b/arch/powerpc/configs/40x/klondike_defconfig @@ -1,5 +1,4 @@ CONFIG_40x=y -CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_SYSFS_DEPRECATED=y @@ -14,10 +13,8 @@ CONFIG_MODULE_UNLOAD=y CONFIG_APM8018X=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_MATH_EMULATION=y -# CONFIG_MIGRATION is not set # CONFIG_SUSPEND is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_PROC_DEVICETREE=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=35000 CONFIG_SCSI=y @@ -51,5 +48,4 @@ CONFIG_AVERAGE=y CONFIG_MAGIC_SYSRQ=y # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y # CONFIG_FTRACE is not set |