diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-01-02 06:13:50 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-01-09 07:03:02 +0100 |
| commit | 56c336cb05d58991f3e9d5f0ec098ba0f219a15e (patch) | |
| tree | b4e209e00292acc53d24e3e4f2a0f1a80425f9bc /arch/powerpc | |
| parent | [POWERPC] Update ppc64_defconfig (diff) | |
| download | linux-56c336cb05d58991f3e9d5f0ec098ba0f219a15e.tar.xz linux-56c336cb05d58991f3e9d5f0ec098ba0f219a15e.zip | |
[POWERPC] Add legacy iSeries to ppc64_defconfig
Since we can now boot legacy iSeries and other machines with the same
config, enable legacy iSeries in ppc64_defconfig.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 35811cc96775..340376a47001 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.20-rc3 -# Tue Jan 2 15:20:02 2007 +# Tue Jan 2 15:32:44 2007 # CONFIG_PPC64=y CONFIG_64BIT=y @@ -133,7 +133,7 @@ CONFIG_PPC_MULTIPLATFORM=y # CONFIG_EMBEDDED6xx is not set # CONFIG_APUS is not set CONFIG_PPC_PSERIES=y -# CONFIG_PPC_ISERIES is not set +CONFIG_PPC_ISERIES=y # CONFIG_PPC_MPC52xx is not set CONFIG_PPC_PMAC=y CONFIG_PPC_PMAC64=y @@ -834,6 +834,7 @@ CONFIG_IBMOL=y # Wan interfaces # # CONFIG_WAN is not set +CONFIG_ISERIES_VETH=m # CONFIG_FDDI is not set # CONFIG_HIPPI is not set CONFIG_PPP=m @@ -946,6 +947,7 @@ CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 CONFIG_HVC_DRIVER=y CONFIG_HVC_CONSOLE=y +CONFIG_HVC_ISERIES=y CONFIG_HVC_RTAS=y CONFIG_HVCS=m @@ -1652,6 +1654,15 @@ CONFIG_NLS_UTF8=m # CONFIG_DLM is not set # +# iSeries device drivers +# +# CONFIG_VIOCONS is not set +CONFIG_VIODASD=y +CONFIG_VIOCD=m +CONFIG_VIOTAPE=m +CONFIG_VIOPATH=y + +# # Library routines # CONFIG_BITREVERSE=y |