diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-13 11:01:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-13 11:01:41 -0400 |
commit | 63b98080daa35f0d682db04f4fb7ada010888752 (patch) | |
tree | 213e124c89a51bbb99dd8e07fb6eacc970bbdc99 /arch/powerpc/configs/pseries_defconfig | |
parent | 1883c5aba9973331e3ff0050e05707fe8e84fe0d (diff) | |
parent | eeac5c142b8687e35780b11b54b4c2f95b1a2436 (diff) |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix G5 DART (IOMMU) race causing occasional data corruption
[POWERPC] Fix MMIO ops to provide expected barrier behaviour
[POWERPC] Fix interrupt clearing in kdump shutdown sequence
[POWERPC] update prep_defconfig
[POWERPC] kdump: Support kernels having 64k page size.
[POWERPC] Implement PowerPC futex_atomic_cmpxchg_inatomic().
[POWERPC] Add new, missing argument to of_irq_map_raw() for 86xx.
[POWERPC] Update defconfigs
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 c18e8600d78f..a8cdf312e1b0 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.18-rc3 | 3 | # Linux kernel version: 2.6.18-rc6 |
4 | # Tue Aug 8 09:14:48 2006 | 4 | # Sun Sep 10 10:45:12 2006 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -128,7 +128,6 @@ CONFIG_PPC_PSERIES=y | |||
128 | # CONFIG_UDBG_RTAS_CONSOLE is not set | 128 | # CONFIG_UDBG_RTAS_CONSOLE is not set |
129 | CONFIG_XICS=y | 129 | CONFIG_XICS=y |
130 | # CONFIG_U3_DART is not set | 130 | # CONFIG_U3_DART is not set |
131 | CONFIG_MPIC=y | ||
132 | CONFIG_PPC_RTAS=y | 131 | CONFIG_PPC_RTAS=y |
133 | CONFIG_RTAS_ERROR_LOGGING=y | 132 | CONFIG_RTAS_ERROR_LOGGING=y |
134 | CONFIG_RTAS_PROC=y | 133 | CONFIG_RTAS_PROC=y |
@@ -140,6 +139,7 @@ CONFIG_IBMEBUS=y | |||
140 | # CONFIG_PPC_970_NAP is not set | 139 | # CONFIG_PPC_970_NAP is not set |
141 | # CONFIG_CPU_FREQ is not set | 140 | # CONFIG_CPU_FREQ is not set |
142 | # CONFIG_WANT_EARLY_SERIAL is not set | 141 | # CONFIG_WANT_EARLY_SERIAL is not set |
142 | CONFIG_MPIC=y | ||
143 | 143 | ||
144 | # | 144 | # |
145 | # Kernel options | 145 | # Kernel options |
@@ -196,6 +196,7 @@ CONFIG_ISA_DMA_API=y | |||
196 | # Bus options | 196 | # Bus options |
197 | # | 197 | # |
198 | CONFIG_GENERIC_ISA_DMA=y | 198 | CONFIG_GENERIC_ISA_DMA=y |
199 | # CONFIG_MPIC_WEIRD is not set | ||
199 | CONFIG_PPC_I8259=y | 200 | CONFIG_PPC_I8259=y |
200 | # CONFIG_PPC_INDIRECT_PCI is not set | 201 | # CONFIG_PPC_INDIRECT_PCI is not set |
201 | CONFIG_PCI=y | 202 | CONFIG_PCI=y |
@@ -790,7 +791,6 @@ CONFIG_SERIAL_JSM=m | |||
790 | CONFIG_UNIX98_PTYS=y | 791 | CONFIG_UNIX98_PTYS=y |
791 | CONFIG_LEGACY_PTYS=y | 792 | CONFIG_LEGACY_PTYS=y |
792 | CONFIG_LEGACY_PTY_COUNT=256 | 793 | CONFIG_LEGACY_PTY_COUNT=256 |
793 | # CONFIG_BRIQ_PANEL is not set | ||
794 | # CONFIG_PRINTER is not set | 794 | # CONFIG_PRINTER is not set |
795 | # CONFIG_PPDEV is not set | 795 | # CONFIG_PPDEV is not set |
796 | # CONFIG_TIPAR is not set | 796 | # CONFIG_TIPAR is not set |