summaryrefslogtreecommitdiffstats
path: root/arch/parisc/Kconfig
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-07-13 21:15:43 +0200
committerTony Luck <tony.luck@intel.com>2005-07-13 21:15:43 +0200
commit99ad25a313bda566a346b46a6015afa65bc0a02b (patch)
treeb9443fed1ab74f320c4ee0791864ee96d7c069df /arch/parisc/Kconfig
parent[IA64] Make PCDP work again. (diff)
parent[PATCH] inotify: misc cleanup (diff)
downloadlinux-99ad25a313bda566a346b46a6015afa65bc0a02b.tar.xz
linux-99ad25a313bda566a346b46a6015afa65bc0a02b.zip
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/parisc/Kconfig')
-rw-r--r--arch/parisc/Kconfig2
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"
endmenu
+source "net/Kconfig"
+
source "drivers/Kconfig"
source "fs/Kconfig"