aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-01-02 00:13:50 -0500
committerPaul Mackerras <paulus@samba.org>2007-01-09 01:03:02 -0500
commit56c336cb05d58991f3e9d5f0ec098ba0f219a15e (patch)
treeb4e209e00292acc53d24e3e4f2a0f1a80425f9bc
parent338e997d94840baca115fb35dcf82867b1f3dc32 (diff)
[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>
-rw-r--r--arch/powerpc/configs/ppc64_defconfig15
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 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20-rc3 3# Linux kernel version: 2.6.20-rc3
4# Tue Jan 2 15:20:02 2007 4# Tue Jan 2 15:32:44 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -133,7 +133,7 @@ CONFIG_PPC_MULTIPLATFORM=y
133# CONFIG_EMBEDDED6xx is not set 133# CONFIG_EMBEDDED6xx is not set
134# CONFIG_APUS is not set 134# CONFIG_APUS is not set
135CONFIG_PPC_PSERIES=y 135CONFIG_PPC_PSERIES=y
136# CONFIG_PPC_ISERIES is not set 136CONFIG_PPC_ISERIES=y
137# CONFIG_PPC_MPC52xx is not set 137# CONFIG_PPC_MPC52xx is not set
138CONFIG_PPC_PMAC=y 138CONFIG_PPC_PMAC=y
139CONFIG_PPC_PMAC64=y 139CONFIG_PPC_PMAC64=y
@@ -834,6 +834,7 @@ CONFIG_IBMOL=y
834# Wan interfaces 834# Wan interfaces
835# 835#
836# CONFIG_WAN is not set 836# CONFIG_WAN is not set
837CONFIG_ISERIES_VETH=m
837# CONFIG_FDDI is not set 838# CONFIG_FDDI is not set
838# CONFIG_HIPPI is not set 839# CONFIG_HIPPI is not set
839CONFIG_PPP=m 840CONFIG_PPP=m
@@ -946,6 +947,7 @@ CONFIG_LEGACY_PTYS=y
946CONFIG_LEGACY_PTY_COUNT=256 947CONFIG_LEGACY_PTY_COUNT=256
947CONFIG_HVC_DRIVER=y 948CONFIG_HVC_DRIVER=y
948CONFIG_HVC_CONSOLE=y 949CONFIG_HVC_CONSOLE=y
950CONFIG_HVC_ISERIES=y
949CONFIG_HVC_RTAS=y 951CONFIG_HVC_RTAS=y
950CONFIG_HVCS=m 952CONFIG_HVCS=m
951 953
@@ -1652,6 +1654,15 @@ CONFIG_NLS_UTF8=m
1652# CONFIG_DLM is not set 1654# CONFIG_DLM is not set
1653 1655
1654# 1656#
1657# iSeries device drivers
1658#
1659# CONFIG_VIOCONS is not set
1660CONFIG_VIODASD=y
1661CONFIG_VIOCD=m
1662CONFIG_VIOTAPE=m
1663CONFIG_VIOPATH=y
1664
1665#
1655# Library routines 1666# Library routines
1656# 1667#
1657CONFIG_BITREVERSE=y 1668CONFIG_BITREVERSE=y