aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 13:16:40 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 13:16:40 -0700
commit9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5 (patch)
tree4d4353bb6535aec7822ea71e594154979728e484 /arch/ia64
parent[PATCH] USB: add ldusb driver (diff)
parent[VLAN]: Fix early vlan adding leads to not functional device (diff)
downloadlinux-dev-9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5.tar.xz
linux-dev-9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 01b78e7f992e..2e08942339ad 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -423,6 +423,8 @@ endmenu
endif
+source "net/Kconfig"
+
source "drivers/Kconfig"
source "fs/Kconfig"