Merge branch 'linus' into sched/devel

[linux-2.6-omap-h63xx.git] / drivers / lguest / Kconfig

diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index 3ec5cc803a090ce7070b7fad6568f6497ebad3e5..6b8dbb9ba73bbedf67aa06d756dfc94d2a66d663 100644 (file)
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -10,20 +10,3 @@ config LGUEST
          not "rustyvisor".  See Documentation/lguest/lguest.txt.
 
          If unsure, say N.  If curious, say M.  If masochistic, say Y.
-
-config LGUEST_GUEST
-       bool
-       help
-         The guest needs code built-in, even if the host has lguest
-         support as a module.  The drivers are tiny, so we build them
-         in too.
-
-config LGUEST_NET
-       tristate
-       default y
-       depends on LGUEST_GUEST && NET
-
-config LGUEST_BLOCK
-       tristate
-       default y
-       depends on LGUEST_GUEST && BLOCK