Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f0767c6 authored by Paul Mackerras's avatar Paul Mackerras Committed by Linus Torvalds
Browse files

[PATCH] ppc64: update defconfigs 



Update the default/example configs for ppc64.  Pretty boring...

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2c875bbd

arch/ppc64/configs/g5_defconfig

+5 −7
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.13-rc3

# Wed Jul 13 14:40:34 2005

# Linux kernel version: 2.6.13-rc6

# Mon Aug  8 14:16:59 2005

#

CONFIG_64BIT=y

CONFIG_MMU=y
@@ -267,8 +267,6 @@ CONFIG_NET_CLS_ROUTE=y 
# Network testing

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set
@@ -468,6 +466,7 @@ CONFIG_SCSI_QLA2XXX=y 
# CONFIG_SCSI_QLA2300 is not set

# CONFIG_SCSI_QLA2322 is not set

# CONFIG_SCSI_QLA6312 is not set

# CONFIG_SCSI_QLA24XX is not set

# CONFIG_SCSI_LPFC is not set

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set
@@ -539,11 +538,9 @@ CONFIG_IEEE1394_RAWIO=y 
#

# Macintosh device drivers

#

CONFIG_ADB=y

CONFIG_ADB_PMU=y

CONFIG_PMAC_SMU=y

# CONFIG_PMAC_BACKLIGHT is not set

# CONFIG_INPUT_ADBHID is not set

CONFIG_THERM_PM72=y



#
@@ -631,6 +628,8 @@ CONFIG_PPPOE=m 
# CONFIG_NET_FC is not set

# CONFIG_SHAPER is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set



#

# ISDN subsystem
@@ -718,7 +717,6 @@ CONFIG_LEGACY_PTY_COUNT=256 
#

# CONFIG_WATCHDOG is not set

# CONFIG_RTC is not set

# CONFIG_GEN_RTC is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

arch/ppc64/configs/iSeries_defconfig

+7 −7
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.13-rc3

# Wed Jul 13 14:43:39 2005

# Linux kernel version: 2.6.13-rc6

# Mon Aug  8 14:17:02 2005

#

CONFIG_64BIT=y

CONFIG_MMU=y
@@ -257,10 +257,6 @@ CONFIG_NET_CLS_ROUTE=y 
# Network testing

#

# CONFIG_NET_PKTGEN is not set

CONFIG_NETPOLL=y

CONFIG_NETPOLL_RX=y

CONFIG_NETPOLL_TRAP=y

CONFIG_NET_POLL_CONTROLLER=y

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set
@@ -388,6 +384,7 @@ CONFIG_SCSI_QLA2XXX=y 
# CONFIG_SCSI_QLA2300 is not set

# CONFIG_SCSI_QLA2322 is not set

# CONFIG_SCSI_QLA6312 is not set

# CONFIG_SCSI_QLA24XX is not set

# CONFIG_SCSI_LPFC is not set

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set
@@ -537,6 +534,10 @@ CONFIG_PPPOE=m 
# CONFIG_NET_FC is not set

# CONFIG_SHAPER is not set

CONFIG_NETCONSOLE=y

CONFIG_NETPOLL=y

CONFIG_NETPOLL_RX=y

CONFIG_NETPOLL_TRAP=y

CONFIG_NET_POLL_CONTROLLER=y



#

# ISDN subsystem
@@ -610,7 +611,6 @@ CONFIG_LEGACY_PTY_COUNT=256 
#

# CONFIG_WATCHDOG is not set

# CONFIG_RTC is not set

# CONFIG_GEN_RTC is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

arch/ppc64/configs/maple_defconfig

+4 −5
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.13-rc3

# Wed Jul 13 14:46:18 2005

# Linux kernel version: 2.6.13-rc6

# Mon Aug  8 14:17:04 2005

#

CONFIG_64BIT=y

CONFIG_MMU=y
@@ -193,8 +193,6 @@ CONFIG_TCP_CONG_BIC=y 
# Network testing

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set
@@ -433,6 +431,8 @@ CONFIG_E1000=y 
# CONFIG_SLIP is not set

# CONFIG_SHAPER is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set



#

# ISDN subsystem
@@ -512,7 +512,6 @@ CONFIG_LEGACY_PTY_COUNT=256 
#

# CONFIG_WATCHDOG is not set

# CONFIG_RTC is not set

# CONFIG_GEN_RTC is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

arch/ppc64/configs/pSeries_defconfig

+7 −7
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.13-rc3

# Wed Jul 13 14:47:54 2005

# Linux kernel version: 2.6.13-rc6

# Mon Aug  8 14:17:07 2005

#

CONFIG_64BIT=y

CONFIG_MMU=y
@@ -287,10 +287,6 @@ CONFIG_NET_CLS_ROUTE=y 
# Network testing

#

# CONFIG_NET_PKTGEN is not set

CONFIG_NETPOLL=y

CONFIG_NETPOLL_RX=y

CONFIG_NETPOLL_TRAP=y

CONFIG_NET_POLL_CONTROLLER=y

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set
@@ -488,6 +484,7 @@ CONFIG_SCSI_QLA22XX=m 
CONFIG_SCSI_QLA2300=m

CONFIG_SCSI_QLA2322=m

CONFIG_SCSI_QLA6312=m

CONFIG_SCSI_QLA24XX=m

CONFIG_SCSI_LPFC=m

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set
@@ -645,6 +642,10 @@ CONFIG_PPPOE=m 
# CONFIG_NET_FC is not set

# CONFIG_SHAPER is not set

CONFIG_NETCONSOLE=y

CONFIG_NETPOLL=y

CONFIG_NETPOLL_RX=y

CONFIG_NETPOLL_TRAP=y

CONFIG_NET_POLL_CONTROLLER=y



#

# ISDN subsystem
@@ -746,7 +747,6 @@ CONFIG_HVCS=m 
#

# CONFIG_WATCHDOG is not set

# CONFIG_RTC is not set

# CONFIG_GEN_RTC is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

arch/ppc64/defconfig

+7 −9
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.13-rc3

# Wed Jul 13 14:37:07 2005

# Linux kernel version: 2.6.13-rc6

# Mon Aug  8 14:16:54 2005

#

CONFIG_64BIT=y

CONFIG_MMU=y
@@ -289,10 +289,6 @@ CONFIG_NET_CLS_ROUTE=y 
# Network testing

#

# CONFIG_NET_PKTGEN is not set

CONFIG_NETPOLL=y

CONFIG_NETPOLL_RX=y

CONFIG_NETPOLL_TRAP=y

CONFIG_NET_POLL_CONTROLLER=y

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set
@@ -506,6 +502,7 @@ CONFIG_SCSI_QLA22XX=m 
CONFIG_SCSI_QLA2300=m

CONFIG_SCSI_QLA2322=m

CONFIG_SCSI_QLA6312=m

CONFIG_SCSI_QLA24XX=m

CONFIG_SCSI_LPFC=m

# CONFIG_SCSI_DC395x is not set

# CONFIG_SCSI_DC390T is not set
@@ -579,11 +576,9 @@ CONFIG_IEEE1394_AMDTP=m 
#

# Macintosh device drivers

#

CONFIG_ADB=y

CONFIG_ADB_PMU=y

CONFIG_PMAC_SMU=y

# CONFIG_PMAC_BACKLIGHT is not set

# CONFIG_INPUT_ADBHID is not set

CONFIG_THERM_PM72=y



#
@@ -694,6 +689,10 @@ CONFIG_PPPOE=m 
# CONFIG_NET_FC is not set

# CONFIG_SHAPER is not set

CONFIG_NETCONSOLE=y

CONFIG_NETPOLL=y

CONFIG_NETPOLL_RX=y

CONFIG_NETPOLL_TRAP=y

CONFIG_NET_POLL_CONTROLLER=y



#

# ISDN subsystem
@@ -797,7 +796,6 @@ CONFIG_HVCS=m 
#

# CONFIG_WATCHDOG is not set

# CONFIG_RTC is not set

# CONFIG_GEN_RTC is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set