summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/44x/ebony_defconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 07:15:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 07:15:53 -0700
commit1929cef46fb057377e43a3d594404f1432db4934 (patch)
tree47bad76826a41a841998fe45dfffb9b254a2c535 /arch/powerpc/configs/44x/ebony_defconfig
parentb5edfefc65526b34960bbff3477ded477b0328f6 (diff)
parent7c9d93604b25c25dc059e2b12ad5e89ca3ed4376 (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Fix mpic_resume on early G5 macs powerpc: rtas_flash needs to use rtas_data_buf powerpc: Unconditionally enabled irq stacks powerpc/kexec: Wait for online/possible CPUs only. powerpc: Disable CONFIG_SYSFS_DEPRECATED powerpc/boot: Remove addRamdisk.c since it is now unused powerpc: Move kdump default base address to 64MB on 64bit powerpc: Remove dead CONFIG_HIGHPTE powerpc/fsl-booke: Move loadcam_entry back to asm code to fix SMP ftrace powerpc/fsl-booke: Fix InstructionTLBError execute permission check
Diffstat (limited to 'arch/powerpc/configs/44x/ebony_defconfig')
-rw-r--r--arch/powerpc/configs/44x/ebony_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/configs/44x/ebony_defconfig b/arch/powerpc/configs/44x/ebony_defconfig
index ca17b1496e3..69f5633cbd4 100644
--- a/arch/powerpc/configs/44x/ebony_defconfig
+++ b/arch/powerpc/configs/44x/ebony_defconfig
@@ -101,8 +101,7 @@ CONFIG_FAIR_GROUP_SCHED=y
CONFIG_USER_SCHED=y
# CONFIG_CGROUP_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