summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-12 08:37:35 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-12 08:37:35 -0800
commit94d4c4cd563aeff4d498168f1c8444074160d0e7 (patch)
treef12b08ef94db4f8510f0bdd97ca89e196ae310e9 /drivers/block
parent2818ef50c4dc103ce52e12d14ce2dfbde5268120 (diff)
parent329620a878cf89184b28500d37fa33cc870a3357 (diff)
downloadop-kernel-dev-94d4c4cd563aeff4d498168f1c8444074160d0e7.zip
op-kernel-dev-94d4c4cd563aeff4d498168f1c8444074160d0e7.tar.gz
Merge branch 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/xenbus: making backend support modular is too complex xen/pci: Make xen-pcifront be dependent on XEN_XENBUS_FRONTEND xen/xenbus: fixup checkpatch issues in xenbus_probe* xen/netfront: select XEN_XENBUS_FRONTEND xen/xenbus: clean up noise in xenbus_probe_frontend.c xen/xenbus: clean up noise in xenbus_probe_backend.c xen/xenbus: clean up noise in xenbus_probe.c xen/xenbus: cleanup debug noise in xenbus_comms.c xen/xenbus: clean up error handling xen/xenbus: make frontend bus GPL xen/xenbus: make sure backend bus is registered earlier xenbus/frontend: register bus earlier xen: remove xen/evtchn.h xen: add backend driver support xen: separate out frontend xenbus
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 4b9359a..83c32cb 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -464,6 +464,7 @@ config XEN_BLKDEV_FRONTEND
tristate "Xen virtual block device support"
depends on XEN
default y
+ select XEN_XENBUS_FRONTEND
help
This driver implements the front-end of the Xen virtual
block device driver. It communicates with a back-end driver
OpenPOWER on IntegriCloud