Skip to content

Commit

Permalink
[POWERPC] Add legacy iSeries to ppc64_defconfig
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Rothwell authored and Paul Mackerras committed Jan 9, 2007
1 parent 338e997 commit 56c336c
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions arch/powerpc/configs/ppc64_defconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -1651,6 +1653,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
#
Expand Down

0 comments on commit 56c336c

Please sign in to comment.