diff options
-rw-r--r-- | arch/powerpc/configs/chrp32_defconfig | 7 | ||||
-rw-r--r-- | arch/powerpc/configs/g5_defconfig | 7 | ||||
-rw-r--r-- | arch/powerpc/configs/iseries_defconfig | 7 | ||||
-rw-r--r-- | arch/powerpc/configs/pmac32_defconfig | 7 | ||||
-rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 8 | ||||
-rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 8 |
6 files changed, 20 insertions, 24 deletions
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig index 38b85b211c38..d7fd298bd234 100644 --- a/arch/powerpc/configs/chrp32_defconfig +++ b/arch/powerpc/configs/chrp32_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:33:36 2008 | 4 | # Thu Mar 27 13:55:37 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -74,8 +74,6 @@ CONFIG_IKCONFIG_PROC=y | |||
74 | CONFIG_LOG_BUF_SHIFT=15 | 74 | CONFIG_LOG_BUF_SHIFT=15 |
75 | # CONFIG_CGROUPS is not set | 75 | # CONFIG_CGROUPS is not set |
76 | # CONFIG_GROUP_SCHED is not set | 76 | # CONFIG_GROUP_SCHED is not set |
77 | # CONFIG_USER_SCHED is not set | ||
78 | # CONFIG_CGROUP_SCHED is not set | ||
79 | CONFIG_SYSFS_DEPRECATED=y | 77 | CONFIG_SYSFS_DEPRECATED=y |
80 | CONFIG_SYSFS_DEPRECATED_V2=y | 78 | CONFIG_SYSFS_DEPRECATED_V2=y |
81 | # CONFIG_RELAY is not set | 79 | # CONFIG_RELAY is not set |
@@ -243,7 +241,7 @@ CONFIG_PCI_SYSCALL=y | |||
243 | # CONFIG_PCIEPORTBUS is not set | 241 | # CONFIG_PCIEPORTBUS is not set |
244 | CONFIG_ARCH_SUPPORTS_MSI=y | 242 | CONFIG_ARCH_SUPPORTS_MSI=y |
245 | # CONFIG_PCI_MSI is not set | 243 | # CONFIG_PCI_MSI is not set |
246 | CONFIG_PCI_LEGACY=y | 244 | # CONFIG_PCI_LEGACY is not set |
247 | # CONFIG_PCI_DEBUG is not set | 245 | # CONFIG_PCI_DEBUG is not set |
248 | # CONFIG_PCCARD is not set | 246 | # CONFIG_PCCARD is not set |
249 | # CONFIG_HOTPLUG_PCI is not set | 247 | # CONFIG_HOTPLUG_PCI is not set |
@@ -1328,6 +1326,7 @@ CONFIG_PLIST=y | |||
1328 | CONFIG_HAS_IOMEM=y | 1326 | CONFIG_HAS_IOMEM=y |
1329 | CONFIG_HAS_IOPORT=y | 1327 | CONFIG_HAS_IOPORT=y |
1330 | CONFIG_HAS_DMA=y | 1328 | CONFIG_HAS_DMA=y |
1329 | CONFIG_HAVE_LMB=y | ||
1331 | 1330 | ||
1332 | # | 1331 | # |
1333 | # Kernel hacking | 1332 | # Kernel hacking |
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 |
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig index 8d9a84f50157..b3128fb7ce7e 100644 --- a/arch/powerpc/configs/iseries_defconfig +++ b/arch/powerpc/configs/iseries_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:43:46 2008 | 4 | # Thu Mar 27 13:55:45 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 |
@@ -261,7 +259,7 @@ CONFIG_PCI_SYSCALL=y | |||
261 | # CONFIG_PCIEPORTBUS is not set | 259 | # CONFIG_PCIEPORTBUS is not set |
262 | CONFIG_ARCH_SUPPORTS_MSI=y | 260 | CONFIG_ARCH_SUPPORTS_MSI=y |
263 | # CONFIG_PCI_MSI is not set | 261 | # CONFIG_PCI_MSI is not set |
264 | CONFIG_PCI_LEGACY=y | 262 | # CONFIG_PCI_LEGACY is not set |
265 | # CONFIG_PCI_DEBUG is not set | 263 | # CONFIG_PCI_DEBUG is not set |
266 | # CONFIG_PCCARD is not set | 264 | # CONFIG_PCCARD is not set |
267 | # CONFIG_HOTPLUG_PCI is not set | 265 | # CONFIG_HOTPLUG_PCI is not set |
@@ -1065,6 +1063,7 @@ CONFIG_PLIST=y | |||
1065 | CONFIG_HAS_IOMEM=y | 1063 | CONFIG_HAS_IOMEM=y |
1066 | CONFIG_HAS_IOPORT=y | 1064 | CONFIG_HAS_IOPORT=y |
1067 | CONFIG_HAS_DMA=y | 1065 | CONFIG_HAS_DMA=y |
1066 | CONFIG_HAVE_LMB=y | ||
1068 | 1067 | ||
1069 | # | 1068 | # |
1070 | # Kernel hacking | 1069 | # Kernel hacking |
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index 558b0d348d4f..fca114252ac7 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_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:05:14 2008 | 4 | # Thu Mar 27 13:56:21 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y | |||
77 | CONFIG_LOG_BUF_SHIFT=14 | 77 | CONFIG_LOG_BUF_SHIFT=14 |
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 |
@@ -272,7 +270,7 @@ CONFIG_PCI_SYSCALL=y | |||
272 | # CONFIG_PCIEPORTBUS is not set | 270 | # CONFIG_PCIEPORTBUS is not set |
273 | CONFIG_ARCH_SUPPORTS_MSI=y | 271 | CONFIG_ARCH_SUPPORTS_MSI=y |
274 | # CONFIG_PCI_MSI is not set | 272 | # CONFIG_PCI_MSI is not set |
275 | CONFIG_PCI_LEGACY=y | 273 | # CONFIG_PCI_LEGACY is not set |
276 | # CONFIG_PCI_DEBUG is not set | 274 | # CONFIG_PCI_DEBUG is not set |
277 | CONFIG_PCCARD=m | 275 | CONFIG_PCCARD=m |
278 | # CONFIG_PCMCIA_DEBUG is not set | 276 | # CONFIG_PCMCIA_DEBUG is not set |
@@ -1895,6 +1893,7 @@ CONFIG_PLIST=y | |||
1895 | CONFIG_HAS_IOMEM=y | 1893 | CONFIG_HAS_IOMEM=y |
1896 | CONFIG_HAS_IOPORT=y | 1894 | CONFIG_HAS_IOPORT=y |
1897 | CONFIG_HAS_DMA=y | 1895 | CONFIG_HAS_DMA=y |
1896 | CONFIG_HAVE_LMB=y | ||
1898 | 1897 | ||
1899 | # | 1898 | # |
1900 | # Kernel hacking | 1899 | # Kernel hacking |
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 880ab7ad10c1..970282b1a004 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_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:06:28 2008 | 4 | # Thu Mar 27 13:56:24 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -84,8 +84,6 @@ CONFIG_CGROUPS=y | |||
84 | # CONFIG_CGROUP_NS is not set | 84 | # CONFIG_CGROUP_NS is not set |
85 | CONFIG_CPUSETS=y | 85 | CONFIG_CPUSETS=y |
86 | # CONFIG_GROUP_SCHED is not set | 86 | # CONFIG_GROUP_SCHED is not set |
87 | # CONFIG_USER_SCHED is not set | ||
88 | # CONFIG_CGROUP_SCHED is not set | ||
89 | # CONFIG_CGROUP_CPUACCT is not set | 87 | # CONFIG_CGROUP_CPUACCT is not set |
90 | # CONFIG_RESOURCE_COUNTERS is not set | 88 | # CONFIG_RESOURCE_COUNTERS is not set |
91 | CONFIG_SYSFS_DEPRECATED=y | 89 | CONFIG_SYSFS_DEPRECATED=y |
@@ -289,6 +287,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y | |||
289 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 287 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
290 | CONFIG_KEXEC=y | 288 | CONFIG_KEXEC=y |
291 | # CONFIG_CRASH_DUMP is not set | 289 | # CONFIG_CRASH_DUMP is not set |
290 | # CONFIG_PHYP_DUMP is not set | ||
292 | CONFIG_IRQ_ALL_CPUS=y | 291 | CONFIG_IRQ_ALL_CPUS=y |
293 | # CONFIG_NUMA is not set | 292 | # CONFIG_NUMA is not set |
294 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 293 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
@@ -335,7 +334,7 @@ CONFIG_PCI_SYSCALL=y | |||
335 | # CONFIG_PCIEPORTBUS is not set | 334 | # CONFIG_PCIEPORTBUS is not set |
336 | CONFIG_ARCH_SUPPORTS_MSI=y | 335 | CONFIG_ARCH_SUPPORTS_MSI=y |
337 | CONFIG_PCI_MSI=y | 336 | CONFIG_PCI_MSI=y |
338 | CONFIG_PCI_LEGACY=y | 337 | # CONFIG_PCI_LEGACY is not set |
339 | # CONFIG_PCI_DEBUG is not set | 338 | # CONFIG_PCI_DEBUG is not set |
340 | CONFIG_PCCARD=y | 339 | CONFIG_PCCARD=y |
341 | # CONFIG_PCMCIA_DEBUG is not set | 340 | # CONFIG_PCMCIA_DEBUG is not set |
@@ -1881,6 +1880,7 @@ CONFIG_PLIST=y | |||
1881 | CONFIG_HAS_IOMEM=y | 1880 | CONFIG_HAS_IOMEM=y |
1882 | CONFIG_HAS_IOPORT=y | 1881 | CONFIG_HAS_IOPORT=y |
1883 | CONFIG_HAS_DMA=y | 1882 | CONFIG_HAS_DMA=y |
1883 | CONFIG_HAVE_LMB=y | ||
1884 | 1884 | ||
1885 | # | 1885 | # |
1886 | # Kernel hacking | 1886 | # Kernel hacking |
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 |