summaryrefslogtreecommitdiffstats
path: root/drivers/lguest
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2007-07-30 02:25:22 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-30 02:37:45 +0200
commit05ff09706bacc92ccadde3a74289118789581475 (patch)
treef18f0a1ff1ac43f9f83fa3ee3508005e83259566 /drivers/lguest
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff)
downloadlinux-05ff09706bacc92ccadde3a74289118789581475.tar.xz
linux-05ff09706bacc92ccadde3a74289118789581475.zip
Make lguest compile with CONFIG_BLOCK=n and CONFIG_NET=n
Gabriel C reports lguest doesn't compile with CONFIG_BLOCK=n. Fix this by introducing a config var for the block device, which depends on LGUEST && BLOCK. Do the same for the net driver, rather then depending gratuitously on CONFIG_NET. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Cc: Gabriel C <nix.or.die@googlemail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/lguest')
-rw-r--r--drivers/lguest/Kconfig10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index 43d901fdc77f..888205c3f76b 100644
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -1,6 +1,6 @@
config LGUEST
tristate "Linux hypervisor example code"
- depends on X86 && PARAVIRT && NET && EXPERIMENTAL && !X86_PAE
+ depends on X86 && PARAVIRT && EXPERIMENTAL && !X86_PAE
select LGUEST_GUEST
select HVC_DRIVER
---help---
@@ -18,3 +18,11 @@ config LGUEST_GUEST
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
+ depends on LGUEST_GUEST && NET
+
+config LGUEST_BLOCK
+ tristate
+ depends on LGUEST_GUEST && BLOCK