diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2007-07-30 02:25:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 02:37:45 +0200 |
| commit | 05ff09706bacc92ccadde3a74289118789581475 (patch) | |
| tree | f18f0a1ff1ac43f9f83fa3ee3508005e83259566 /drivers/block | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff) | |
| download | linux-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/block')
| -rw-r--r-- | drivers/block/Makefile | 2 |
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 |