Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / lguest / Kconfig

diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index 888205c..41e2250 100644 (file)
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -1,6 +1,6 @@
 config LGUEST
        tristate "Linux hypervisor example code"
 config LGUEST
        tristate "Linux hypervisor example code"

-       depends on X86 && PARAVIRT && EXPERIMENTAL && !X86_PAE
+       depends on X86 && PARAVIRT && EXPERIMENTAL && !X86_PAE && FUTEX

        select LGUEST_GUEST
        select HVC_DRIVER
        ---help---
        select LGUEST_GUEST
        select HVC_DRIVER
        ---help---


@@ -21,8 +21,10 @@ config LGUEST_GUEST
 
 config LGUEST_NET
        tristate
 
 config LGUEST_NET
        tristate

+       default y

        depends on LGUEST_GUEST && NET
 
 config LGUEST_BLOCK
        tristate
        depends on LGUEST_GUEST && NET
 
 config LGUEST_BLOCK
        tristate

+       default y

        depends on LGUEST_GUEST && BLOCK
        depends on LGUEST_GUEST && BLOCK