diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 19:45:24 +0200 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 19:45:24 +0200 |
| commit | a2262d8a231e92742651859a10c9a4430a5e899a (patch) | |
| tree | b5a823e3f6a3f60e1dd995f113caf0b350228d84 /arch/powerpc/configs/gamecube_defconfig | |
| parent | arch/tile: catch up on various minor cleanups. (diff) | |
| parent | Linux 2.6.35-rc4 (diff) | |
| download | linux-a2262d8a231e92742651859a10c9a4430a5e899a.tar.xz linux-a2262d8a231e92742651859a10c9a4430a5e899a.zip | |
Merge branch 'master' into for-linus
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 |