diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-26 03:52:21 +0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-26 03:52:21 +0400 |
commit | 5ffdcd94ea0171cf9a3ca63051c2246426103b5b (patch) | |
tree | dfa1522796d5af649caf64ac6e2f1e69119e85d0 /arch/powerpc/configs/gamecube_defconfig | |
parent | cf40f082f8d3a98e28af02af20d00d2500eb6a65 (diff) | |
parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) | |
download | linux-5ffdcd94ea0171cf9a3ca63051c2246426103b5b.tar.xz |
Merge commit 'v2.6.35-rc6' into spi/test
Diffstat (limited to 'arch/powerpc/configs/gamecube_defconfig')
-rw-r--r-- | arch/powerpc/configs/gamecube_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/configs/gamecube_defconfig b/arch/powerpc/configs/gamecube_defconfig index 942e1193e9e4..1c2dbf07ac35 100644 --- a/arch/powerpc/configs/gamecube_defconfig +++ b/arch/powerpc/configs/gamecube_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 |