diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-22 21:22:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-22 21:22:42 -0400 |
| commit | 76fef2b6bffa13ad7ccd54c0493b053295721b9a (patch) | |
| tree | f4509477d413398b7155fb3c35453ab26bd81bce /arch | |
| parent | 817bc4db7794d6dc6594265ddea88d2b839cf2f8 (diff) | |
| parent | ef8500457b29eed13d03ff19af36d810308e57b7 (diff) | |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Conflicts:
drivers/s390/net/qeth_main.c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/defconfig | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index 62f6b5a606dd..cb93bf20bd75 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig | |||
| @@ -537,11 +537,9 @@ CONFIG_CTC=m | |||
| 537 | # CONFIG_SMSGIUCV is not set | 537 | # CONFIG_SMSGIUCV is not set |
| 538 | # CONFIG_CLAW is not set | 538 | # CONFIG_CLAW is not set |
| 539 | CONFIG_QETH=y | 539 | CONFIG_QETH=y |
| 540 | 540 | CONFIG_QETH_L2=y | |
| 541 | # | 541 | CONFIG_QETH_L3=y |
| 542 | # Gigabit Ethernet default settings | 542 | CONFIG_QETH_IPV6=y |
| 543 | # | ||
| 544 | # CONFIG_QETH_IPV6 is not set | ||
| 545 | CONFIG_CCWGROUP=y | 543 | CONFIG_CCWGROUP=y |
| 546 | # CONFIG_PPP is not set | 544 | # CONFIG_PPP is not set |
| 547 | # CONFIG_SLIP is not set | 545 | # CONFIG_SLIP is not set |