diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /arch/s390 | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 6600ee87f896..477ac2758bd5 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
| @@ -465,6 +465,8 @@ config KEXEC | |||
| 465 | 465 | ||
| 466 | endmenu | 466 | endmenu |
| 467 | 467 | ||
| 468 | source "net/Kconfig" | ||
| 469 | |||
| 468 | config PCMCIA | 470 | config PCMCIA |
| 469 | bool | 471 | bool |
| 470 | default n | 472 | default n |
| @@ -475,7 +477,7 @@ source "drivers/scsi/Kconfig" | |||
| 475 | 477 | ||
| 476 | source "drivers/s390/Kconfig" | 478 | source "drivers/s390/Kconfig" |
| 477 | 479 | ||
| 478 | source "net/Kconfig" | 480 | source "drivers/net/Kconfig" |
| 479 | 481 | ||
| 480 | source "fs/Kconfig" | 482 | source "fs/Kconfig" |
| 481 | 483 | ||