summaryrefslogtreecommitdiffstats
path: root/arch/m68k/Kconfig
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@austin.ibm.com>2005-07-13 15:57:38 +0200
committerDave Kleikamp <shaggy@austin.ibm.com>2005-07-13 15:57:38 +0200
commitf7f24758ac98a506770bc5910d33567610fa3403 (patch)
treeff7fad3d01bf9dc2e2e54b908f9fca4891e1ee72 /arch/m68k/Kconfig
parentJFS: Code cleanup - getting rid of never-used debug code (diff)
parentLinux 2.6.13-rc3 (diff)
downloadlinux-f7f24758ac98a506770bc5910d33567610fa3403.tar.xz
linux-f7f24758ac98a506770bc5910d33567610fa3403.zip
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'arch/m68k/Kconfig')
-rw-r--r--arch/m68k/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 691a2469ff36..178c4a3fbb72 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -450,6 +450,8 @@ source "drivers/zorro/Kconfig"
endmenu
+source "net/Kconfig"
+
source "drivers/Kconfig"
menu "Character devices"