diff options
Diffstat (limited to 'arch/powerpc/configs/pseries_defconfig')
-rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index 755aca72b522..3e2593c60b12 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.25-rc6 |
4 | # Thu Mar 20 11:08:01 2008 | 4 | # Thu Mar 27 13:56:28 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -83,8 +83,6 @@ CONFIG_CGROUPS=y | |||
83 | CONFIG_CGROUP_NS=y | 83 | CONFIG_CGROUP_NS=y |
84 | CONFIG_CPUSETS=y | 84 | CONFIG_CPUSETS=y |
85 | # CONFIG_GROUP_SCHED is not set | 85 | # CONFIG_GROUP_SCHED is not set |
86 | # CONFIG_USER_SCHED is not set | ||
87 | # CONFIG_CGROUP_SCHED is not set | ||
88 | CONFIG_CGROUP_CPUACCT=y | 86 | CONFIG_CGROUP_CPUACCT=y |
89 | # CONFIG_RESOURCE_COUNTERS is not set | 87 | # CONFIG_RESOURCE_COUNTERS is not set |
90 | CONFIG_SYSFS_DEPRECATED=y | 88 | CONFIG_SYSFS_DEPRECATED=y |
@@ -237,6 +235,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y | |||
237 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 235 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
238 | CONFIG_KEXEC=y | 236 | CONFIG_KEXEC=y |
239 | # CONFIG_CRASH_DUMP is not set | 237 | # CONFIG_CRASH_DUMP is not set |
238 | # CONFIG_PHYP_DUMP is not set | ||
240 | CONFIG_IRQ_ALL_CPUS=y | 239 | CONFIG_IRQ_ALL_CPUS=y |
241 | CONFIG_NUMA=y | 240 | CONFIG_NUMA=y |
242 | CONFIG_NODES_SHIFT=4 | 241 | CONFIG_NODES_SHIFT=4 |
@@ -283,7 +282,7 @@ CONFIG_PCI_SYSCALL=y | |||
283 | # CONFIG_PCIEPORTBUS is not set | 282 | # CONFIG_PCIEPORTBUS is not set |
284 | CONFIG_ARCH_SUPPORTS_MSI=y | 283 | CONFIG_ARCH_SUPPORTS_MSI=y |
285 | CONFIG_PCI_MSI=y | 284 | CONFIG_PCI_MSI=y |
286 | CONFIG_PCI_LEGACY=y | 285 | # CONFIG_PCI_LEGACY is not set |
287 | # CONFIG_PCI_DEBUG is not set | 286 | # CONFIG_PCI_DEBUG is not set |
288 | # CONFIG_PCCARD is not set | 287 | # CONFIG_PCCARD is not set |
289 | CONFIG_HOTPLUG_PCI=m | 288 | CONFIG_HOTPLUG_PCI=m |
@@ -1519,6 +1518,7 @@ CONFIG_PLIST=y | |||
1519 | CONFIG_HAS_IOMEM=y | 1518 | CONFIG_HAS_IOMEM=y |
1520 | CONFIG_HAS_IOPORT=y | 1519 | CONFIG_HAS_IOPORT=y |
1521 | CONFIG_HAS_DMA=y | 1520 | CONFIG_HAS_DMA=y |
1521 | CONFIG_HAVE_LMB=y | ||
1522 | 1522 | ||
1523 | # | 1523 | # |
1524 | # Kernel hacking | 1524 | # Kernel hacking |