Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05ff0970 authored by Rusty Russell's avatar Rusty Russell Committed by Linus Torvalds
Browse files

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: default avatarRusty Russell <rusty@rustcorp.com.au>
Cc: Gabriel C <nix.or.die@googlemail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a6ce22a5

drivers/block/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -31,4 +31,4 @@ obj-$(CONFIG_BLK_DEV_SX8) += sx8.o 
obj-$(CONFIG_BLK_DEV_UB)	+= ub.o



obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= xen-blkfront.o

obj-$(CONFIG_LGUEST_GUEST)	+= lguest_blk.o
 
obj-$(CONFIG_LGUEST_BLOCK)	+= lguest_blk.o

drivers/lguest/Kconfig

+9 −1
Original line number Diff line number Diff line 
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

drivers/net/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ obj-$(CONFIG_ZORRO8390) += zorro8390.o 
obj-$(CONFIG_HPLANCE) += hplance.o 7990.o

obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o

obj-$(CONFIG_EQUALIZER) += eql.o

obj-$(CONFIG_LGUEST_GUEST) += lguest_net.o

obj-$(CONFIG_LGUEST_NET) += lguest_net.o

obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o

obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o

obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o