git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to VServer 1.9.0
[linux-2.6.git]
/
arch
/
ppc
/
Kconfig
diff --git
a/arch/ppc/Kconfig
b/arch/ppc/Kconfig
index
faeb15e
..
d5b49d2
100644
(file)
--- a/
arch/ppc/Kconfig
+++ b/
arch/ppc/Kconfig
@@
-1269,6
+1269,8
@@
config PPC_OCP
endmenu
+source "kernel/vserver/Kconfig"
+
source "security/Kconfig"
source "crypto/Kconfig"