diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2007-07-30 10:25:22 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-29 17:37:45 -0700 |
| commit | 05ff09706bacc92ccadde3a74289118789581475 (patch) | |
| tree | f18f0a1ff1ac43f9f83fa3ee3508005e83259566 /drivers | |
| parent | a6ce22a5f61ba838b43763bf1e5be399f9dee4d0 (diff) | |
| download | linux-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')
| -rw-r--r-- | drivers/block/Makefile | 2 | ||||
| -rw-r--r-- | drivers/lguest/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/net/Makefile | 2 |
3 files changed, 11 insertions, 3 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 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 diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 94b78cc5fe86..e684212fd8e2 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -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 |