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/v850 | |
| parent | 2824bd250f0be1551747cc3ed5ae07facc285b57 (diff) | |
| parent | f4637b55ba960d9987a836617271659e9b7b0de8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/v850')
| -rw-r--r-- | arch/v850/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig index 27febd6ffa80..89c053b6c2c4 100644 --- a/arch/v850/Kconfig +++ b/arch/v850/Kconfig | |||
| @@ -250,6 +250,8 @@ source "fs/Kconfig.binfmt" | |||
| 250 | 250 | ||
| 251 | endmenu | 251 | endmenu |
| 252 | 252 | ||
| 253 | source "net/Kconfig" | ||
| 254 | |||
| 253 | ############################################################################# | 255 | ############################################################################# |
| 254 | 256 | ||
| 255 | source "drivers/base/Kconfig" | 257 | source "drivers/base/Kconfig" |
| @@ -283,7 +285,7 @@ source "drivers/ieee1394/Kconfig" | |||
| 283 | 285 | ||
| 284 | source "drivers/message/i2o/Kconfig" | 286 | source "drivers/message/i2o/Kconfig" |
| 285 | 287 | ||
| 286 | source "net/Kconfig" | 288 | source "drivers/net/Kconfig" |
| 287 | 289 | ||
| 288 | source "drivers/isdn/Kconfig" | 290 | source "drivers/isdn/Kconfig" |
| 289 | 291 | ||