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/parisc/Kconfig | |
| parent | 2824bd250f0be1551747cc3ed5ae07facc285b57 (diff) | |
| parent | f4637b55ba960d9987a836617271659e9b7b0de8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/parisc/Kconfig')
| -rw-r--r-- | arch/parisc/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index ce327c799b44..1c2d87435233 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
| @@ -190,6 +190,8 @@ source "fs/Kconfig.binfmt" | |||
| 190 | 190 | ||
| 191 | endmenu | 191 | endmenu |
| 192 | 192 | ||
| 193 | source "net/Kconfig" | ||
| 194 | |||
| 193 | source "drivers/Kconfig" | 195 | source "drivers/Kconfig" |
| 194 | 196 | ||
| 195 | source "fs/Kconfig" | 197 | source "fs/Kconfig" |