summaryrefslogtreecommitdiffstats
path: root/arch/xtensa/Kconfig
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/xtensa/Kconfig
parent2824bd250f0be1551747cc3ed5ae07facc285b57 (diff)
parentf4637b55ba960d9987a836617271659e9b7b0de8 (diff)
downloadkernel-crypto-9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5.tar.gz
kernel-crypto-9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5.tar.xz
kernel-crypto-9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/xtensa/Kconfig')
-rw-r--r--arch/xtensa/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index c9b5d298e3c..2b6257bec4c 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -228,6 +228,8 @@ source "fs/Kconfig.binfmt"
endmenu
+source "net/Kconfig"
+
source "drivers/Kconfig"
source "fs/Kconfig"