diff options
author | Paul Mackerras <paulus@samba.org> | 2006-09-09 21:04:36 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-09-09 21:04:36 -0400 |
commit | fb7d527c1aec5e224fb3a0772337f8b5e59eecd0 (patch) | |
tree | 5bbb2da58ef0d4bdb29abe3a37047dcd29d19969 /arch/powerpc/configs/iseries_defconfig | |
parent | 10387e5eb45c6e48d67102b88229f5bc6037461c (diff) |
[POWERPC] Update defconfigs
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/configs/iseries_defconfig')
-rw-r--r-- | arch/powerpc/configs/iseries_defconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig index 72ed95b3ead6..eb0885ea0731 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.18-rc3 | 3 | # Linux kernel version: 2.6.18-rc6 |
4 | # Tue Aug 8 09:15:46 2006 | 4 | # Sun Sep 10 10:22:57 2006 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -129,6 +129,7 @@ CONFIG_IBMVIO=y | |||
129 | # CONFIG_PPC_970_NAP is not set | 129 | # CONFIG_PPC_970_NAP is not set |
130 | # CONFIG_CPU_FREQ is not set | 130 | # CONFIG_CPU_FREQ is not set |
131 | # CONFIG_WANT_EARLY_SERIAL is not set | 131 | # CONFIG_WANT_EARLY_SERIAL is not set |
132 | # CONFIG_MPIC is not set | ||
132 | 133 | ||
133 | # | 134 | # |
134 | # Kernel options | 135 | # Kernel options |
@@ -172,6 +173,7 @@ CONFIG_ISA_DMA_API=y | |||
172 | # Bus options | 173 | # Bus options |
173 | # | 174 | # |
174 | CONFIG_GENERIC_ISA_DMA=y | 175 | CONFIG_GENERIC_ISA_DMA=y |
176 | # CONFIG_MPIC_WEIRD is not set | ||
175 | # CONFIG_PPC_I8259 is not set | 177 | # CONFIG_PPC_I8259 is not set |
176 | # CONFIG_PPC_INDIRECT_PCI is not set | 178 | # CONFIG_PPC_INDIRECT_PCI is not set |
177 | CONFIG_PCI=y | 179 | CONFIG_PCI=y |
@@ -716,7 +718,6 @@ CONFIG_SERIAL_ICOM=m | |||
716 | CONFIG_UNIX98_PTYS=y | 718 | CONFIG_UNIX98_PTYS=y |
717 | CONFIG_LEGACY_PTYS=y | 719 | CONFIG_LEGACY_PTYS=y |
718 | CONFIG_LEGACY_PTY_COUNT=256 | 720 | CONFIG_LEGACY_PTY_COUNT=256 |
719 | # CONFIG_BRIQ_PANEL is not set | ||
720 | 721 | ||
721 | # | 722 | # |
722 | # IPMI | 723 | # IPMI |