diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-07 12:17:34 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-07 12:17:34 +0300 |
| commit | b7a4abb67416aa07cd65446dd39e64525ccfe8e5 (patch) | |
| tree | 8f5b0f9ffb617622944b5e6368473f91e3efeaa4 /drivers/lguest/Kconfig | |
| parent | d30323f810e4da94eb75cf4bfe5165b9518c64df (diff) | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
| download | linux-b7a4abb67416aa07cd65446dd39e64525ccfe8e5.tar.xz | |
Merge 4.0-rc7 into usb-next
We want the fixes in here, and to help resolve merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/lguest/Kconfig')
| -rw-r--r-- | drivers/lguest/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig index ee035ec4526b..169172d2ba05 100644 --- a/drivers/lguest/Kconfig +++ b/drivers/lguest/Kconfig @@ -1,6 +1,6 @@ config LGUEST tristate "Linux hypervisor example code" - depends on X86_32 && EVENTFD && TTY + depends on X86_32 && EVENTFD && TTY && PCI_DIRECT select HVC_DRIVER ---help--- This is a very simple module which allows you to run |