diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 22:16:40 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 22:16:40 +0200 |
| commit | 9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5 (patch) | |
| tree | 4d4353bb6535aec7822ea71e594154979728e484 /arch/v850 | |
| parent | [PATCH] USB: add ldusb driver (diff) | |
| parent | [VLAN]: Fix early vlan adding leads to not functional device (diff) | |
| download | linux-9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5.tar.xz linux-9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5.zip | |
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" endmenu +source "net/Kconfig" + ############################################################################# source "drivers/base/Kconfig" @@ -283,7 +285,7 @@ source "drivers/ieee1394/Kconfig" source "drivers/message/i2o/Kconfig" -source "net/Kconfig" +source "drivers/net/Kconfig" source "drivers/isdn/Kconfig" |