summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2007-07-30 10:25:22 +1000
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-29 17:37:45 -0700
commit05ff09706bacc92ccadde3a74289118789581475 (patch)
treef18f0a1ff1ac43f9f83fa3ee3508005e83259566 /drivers/block
parenta6ce22a5f61ba838b43763bf1e5be399f9dee4d0 (diff)
downloadlinux-stable-05ff09706bacc92ccadde3a74289118789581475.tar.gz
linux-stable-05ff09706bacc92ccadde3a74289118789581475.tar.bz2
linux-stable-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/block')
-rw-r--r--drivers/block/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index a7a099027fca..014e72121b5a 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -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