diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-09-10 03:04:36 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-09-10 03:04:36 +0200 |
| commit | fb7d527c1aec5e224fb3a0772337f8b5e59eecd0 (patch) | |
| tree | 5bbb2da58ef0d4bdb29abe3a37047dcd29d19969 /arch/powerpc/configs/iseries_defconfig | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-fb7d527c1aec5e224fb3a0772337f8b5e59eecd0.tar.xz linux-fb7d527c1aec5e224fb3a0772337f8b5e59eecd0.zip | |
[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 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18-rc3 -# Tue Aug 8 09:15:46 2006 +# Linux kernel version: 2.6.18-rc6 +# Sun Sep 10 10:22:57 2006 # CONFIG_PPC64=y CONFIG_64BIT=y @@ -129,6 +129,7 @@ CONFIG_IBMVIO=y # CONFIG_PPC_970_NAP is not set # CONFIG_CPU_FREQ is not set # CONFIG_WANT_EARLY_SERIAL is not set +# CONFIG_MPIC is not set # # Kernel options @@ -172,6 +173,7 @@ CONFIG_ISA_DMA_API=y # Bus options # CONFIG_GENERIC_ISA_DMA=y +# CONFIG_MPIC_WEIRD is not set # CONFIG_PPC_I8259 is not set # CONFIG_PPC_INDIRECT_PCI is not set CONFIG_PCI=y @@ -716,7 +718,6 @@ CONFIG_SERIAL_ICOM=m CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 -# CONFIG_BRIQ_PANEL is not set # # IPMI |