diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-09-10 05:04:36 +0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-09-10 05:04:36 +0400 |
| commit | fb7d527c1aec5e224fb3a0772337f8b5e59eecd0 (patch) | |
| tree | 5bbb2da58ef0d4bdb29abe3a37047dcd29d19969 /arch/powerpc/configs/pseries_defconfig | |
| parent | 10387e5eb45c6e48d67102b88229f5bc6037461c (diff) | |
| download | linux-fb7d527c1aec5e224fb3a0772337f8b5e59eecd0.tar.xz | |
[POWERPC] Update defconfigs
Signed-off-by: Paul Mackerras <paulus@samba.org>
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 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18-rc3 -# Tue Aug 8 09:14:48 2006 +# Linux kernel version: 2.6.18-rc6 +# Sun Sep 10 10:45:12 2006 # CONFIG_PPC64=y CONFIG_64BIT=y @@ -128,7 +128,6 @@ CONFIG_PPC_PSERIES=y # CONFIG_UDBG_RTAS_CONSOLE is not set CONFIG_XICS=y # CONFIG_U3_DART is not set -CONFIG_MPIC=y CONFIG_PPC_RTAS=y CONFIG_RTAS_ERROR_LOGGING=y CONFIG_RTAS_PROC=y @@ -140,6 +139,7 @@ CONFIG_IBMEBUS=y # CONFIG_PPC_970_NAP is not set # CONFIG_CPU_FREQ is not set # CONFIG_WANT_EARLY_SERIAL is not set +CONFIG_MPIC=y # # Kernel options @@ -196,6 +196,7 @@ CONFIG_ISA_DMA_API=y # Bus options # CONFIG_GENERIC_ISA_DMA=y +# CONFIG_MPIC_WEIRD is not set CONFIG_PPC_I8259=y # CONFIG_PPC_INDIRECT_PCI is not set CONFIG_PCI=y @@ -790,7 +791,6 @@ CONFIG_SERIAL_JSM=m CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 -# CONFIG_BRIQ_PANEL is not set # CONFIG_PRINTER is not set # CONFIG_PPDEV is not set # CONFIG_TIPAR is not set |