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/mips | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index bd9de7b00c0a..b578239146b5 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -1640,6 +1640,8 @@ config PM | |||
| 1640 | 1640 | ||
| 1641 | endmenu | 1641 | endmenu |
| 1642 | 1642 | ||
| 1643 | source "net/Kconfig" | ||
| 1644 | |||
| 1643 | source "drivers/Kconfig" | 1645 | source "drivers/Kconfig" |
| 1644 | 1646 | ||
| 1645 | source "fs/Kconfig" | 1647 | source "fs/Kconfig" |