diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 07:15:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 07:15:53 -0700 |
| commit | 1929cef46fb057377e43a3d594404f1432db4934 (patch) | |
| tree | 47bad76826a41a841998fe45dfffb9b254a2c535 /arch/powerpc/configs/holly_defconfig | |
| parent | b5edfefc65526b34960bbff3477ded477b0328f6 (diff) | |
| parent | 7c9d93604b25c25dc059e2b12ad5e89ca3ed4376 (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/holly_defconfig')
| -rw-r--r-- | arch/powerpc/configs/holly_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig index a211a79959ca..a60d61bee48d 100644 --- a/arch/powerpc/configs/holly_defconfig +++ b/arch/powerpc/configs/holly_defconfig @@ -73,7 +73,6 @@ CONFIG_SYSVIPC_SYSCTL=y CONFIG_LOG_BUF_SHIFT=14 # CONFIG_CGROUPS is not set # CONFIG_FAIR_GROUP_SCHED is not set -CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" |