summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/44x/eiger_defconfig
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-07-02 13:05:10 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-07-02 13:05:10 +0900
commit12462d77ec78be9fb033580b7b64ddf9d0fee44b (patch)
treea21157428d46259ed2c8a727ac12a2e658d8181a /arch/powerpc/configs/44x/eiger_defconfig
parent598ee698d9db7beb06e12f4ea9d9a5fbc03a3a77 (diff)
parent97e0214044d9f279a3d6286c9f859696ef0b7ebe (diff)
downloadblackbird-op-linux-12462d77ec78be9fb033580b7b64ddf9d0fee44b.tar.gz
blackbird-op-linux-12462d77ec78be9fb033580b7b64ddf9d0fee44b.zip
Merge branches 'sh/highmem' and 'sh/stable-updates'
Diffstat (limited to 'arch/powerpc/configs/44x/eiger_defconfig')
-rw-r--r--arch/powerpc/configs/44x/eiger_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/configs/44x/eiger_defconfig b/arch/powerpc/configs/44x/eiger_defconfig
index e3149bade0b2..dcd859c8b4a6 100644
--- a/arch/powerpc/configs/44x/eiger_defconfig
+++ b/arch/powerpc/configs/44x/eiger_defconfig
@@ -98,8 +98,7 @@ CONFIG_RCU_FANOUT=32
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_GROUP_SCHED is not set
# CONFIG_CGROUPS is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
# CONFIG_RELAY is not set
# CONFIG_NAMESPACES is not set
CONFIG_BLK_DEV_INITRD=y
OpenPOWER on IntegriCloud