projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-2.6
[powerpc.git]
/
arch
/
sparc64
/
Kconfig
diff --git
a/arch/sparc64/Kconfig
b/arch/sparc64/Kconfig
index
5e8591c
..
9afd28e
100644
(file)
--- a/
arch/sparc64/Kconfig
+++ b/
arch/sparc64/Kconfig
@@
-525,6
+525,8
@@
source "mm/Kconfig"
endmenu
+source "net/Kconfig"
+
source "drivers/base/Kconfig"
source "drivers/video/Kconfig"
@@
-551,7
+553,7
@@
endif
source "drivers/ieee1394/Kconfig"
-source "net/Kconfig"
+source "
drivers/
net/Kconfig"
source "drivers/isdn/Kconfig"