aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-18 21:02:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-18 21:02:35 -0400
commit334d094504c2fe1c44211ecb49146ae6bca8c321 (patch)
treed3c0f68e4b9f8e3d2ccc39e7dfe5de0534a5fad9 /arch/s390
parentd1a4be630fb068f251d64b62919f143c49ca8057 (diff)
parentd1643d24c61b725bef399cc1cf2944b4c9c23177 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26: (1090 commits) [NET]: Fix and allocate less memory for ->priv'less netdevices [IPV6]: Fix dangling references on error in fib6_add(). [NETLABEL]: Fix NULL deref in netlbl_unlabel_staticlist_gen() if ifindex not found [PKT_SCHED]: Fix datalen check in tcf_simp_init(). [INET]: Uninline the __inet_inherit_port call. [INET]: Drop the inet_inherit_port() call. SCTP: Initialize partial_bytes_acked to 0, when all of the data is acked. [netdrvr] forcedeth: internal simplifications; changelog removal phylib: factor out get_phy_id from within get_phy_device PHY: add BCM5464 support to broadcom PHY driver cxgb3: Fix __must_check warning with dev_dbg. tc35815: Statistics cleanup natsemi: fix MMIO for PPC 44x platforms [TIPC]: Cleanup of TIPC reference table code [TIPC]: Optimized initialization of TIPC reference table [TIPC]: Remove inlining of reference table locking routines e1000: convert uint16_t style integers to u16 ixgb: convert uint16_t style integers to u16 sb1000.c: make const arrays static sb1000.c: stop inlining largish static functions ...
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/defconfig8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index dcc3ec2ef643..a72f208e62d0 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -538,11 +538,9 @@ CONFIG_CTC=m
538# CONFIG_SMSGIUCV is not set 538# CONFIG_SMSGIUCV is not set
539# CONFIG_CLAW is not set 539# CONFIG_CLAW is not set
540CONFIG_QETH=y 540CONFIG_QETH=y
541 541CONFIG_QETH_L2=y
542# 542CONFIG_QETH_L3=y
543# Gigabit Ethernet default settings 543CONFIG_QETH_IPV6=y
544#
545# CONFIG_QETH_IPV6 is not set
546CONFIG_CCWGROUP=y 544CONFIG_CCWGROUP=y
547# CONFIG_PPP is not set 545# CONFIG_PPP is not set
548# CONFIG_SLIP is not set 546# CONFIG_SLIP is not set