diff options
Diffstat (limited to 'arch/powerpc/configs/g5_defconfig')
-rw-r--r-- | arch/powerpc/configs/g5_defconfig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index 0f82f66a60f8..a20501f89474 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_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 10:36:41 2008 | 4 | # Thu Mar 27 13:55:43 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y | |||
77 | CONFIG_LOG_BUF_SHIFT=17 | 77 | CONFIG_LOG_BUF_SHIFT=17 |
78 | # CONFIG_CGROUPS is not set | 78 | # CONFIG_CGROUPS is not set |
79 | # CONFIG_GROUP_SCHED is not set | 79 | # CONFIG_GROUP_SCHED is not set |
80 | # CONFIG_USER_SCHED is not set | ||
81 | # CONFIG_CGROUP_SCHED is not set | ||
82 | CONFIG_SYSFS_DEPRECATED=y | 80 | CONFIG_SYSFS_DEPRECATED=y |
83 | CONFIG_SYSFS_DEPRECATED_V2=y | 81 | CONFIG_SYSFS_DEPRECATED_V2=y |
84 | # CONFIG_RELAY is not set | 82 | # CONFIG_RELAY is not set |
@@ -276,7 +274,7 @@ CONFIG_PCI_SYSCALL=y | |||
276 | # CONFIG_PCIEPORTBUS is not set | 274 | # CONFIG_PCIEPORTBUS is not set |
277 | CONFIG_ARCH_SUPPORTS_MSI=y | 275 | CONFIG_ARCH_SUPPORTS_MSI=y |
278 | CONFIG_PCI_MSI=y | 276 | CONFIG_PCI_MSI=y |
279 | CONFIG_PCI_LEGACY=y | 277 | # CONFIG_PCI_LEGACY is not set |
280 | # CONFIG_PCI_DEBUG is not set | 278 | # CONFIG_PCI_DEBUG is not set |
281 | # CONFIG_PCCARD is not set | 279 | # CONFIG_PCCARD is not set |
282 | # CONFIG_HOTPLUG_PCI is not set | 280 | # CONFIG_HOTPLUG_PCI is not set |
@@ -1596,6 +1594,7 @@ CONFIG_PLIST=y | |||
1596 | CONFIG_HAS_IOMEM=y | 1594 | CONFIG_HAS_IOMEM=y |
1597 | CONFIG_HAS_IOPORT=y | 1595 | CONFIG_HAS_IOPORT=y |
1598 | CONFIG_HAS_DMA=y | 1596 | CONFIG_HAS_DMA=y |
1597 | CONFIG_HAVE_LMB=y | ||
1599 | 1598 | ||
1600 | # | 1599 | # |
1601 | # Kernel hacking | 1600 | # Kernel hacking |