commit 05ff09706bacc92ccadde3a74289118789581475
author Rusty Russell <rusty@rustcorp.com.au> Mon Jul 30 10:25:22 2007 +1000
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Sun Jul 29 17:37:45 2007 -0700
tree f18f0a1ff1ac43f9f83fa3ee3508005e83259566
parent a6ce22a5f61ba838b43763bf1e5be399f9dee4d0

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>

drivers/net/Makefile

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 94b78cc..e684212 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -177,7 +177,7 @@
 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