diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 16:16:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 16:16:40 -0400 |
| commit | 9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5 (patch) | |
| tree | 4d4353bb6535aec7822ea71e594154979728e484 /arch/mips/Kconfig | |
| parent | 2824bd250f0be1551747cc3ed5ae07facc285b57 (diff) | |
| parent | f4637b55ba960d9987a836617271659e9b7b0de8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/mips/Kconfig')
| -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" |