diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-12 11:37:35 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-12 11:37:35 -0500 |
| commit | 94d4c4cd563aeff4d498168f1c8444074160d0e7 (patch) | |
| tree | f12b08ef94db4f8510f0bdd97ca89e196ae310e9 /drivers/block | |
| parent | 2818ef50c4dc103ce52e12d14ce2dfbde5268120 (diff) | |
| parent | 329620a878cf89184b28500d37fa33cc870a3357 (diff) | |
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/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 4b9359a6f6ca..83c32cb72582 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig | |||
| @@ -464,6 +464,7 @@ config XEN_BLKDEV_FRONTEND | |||
| 464 | tristate "Xen virtual block device support" | 464 | tristate "Xen virtual block device support" |
| 465 | depends on XEN | 465 | depends on XEN |
| 466 | default y | 466 | default y |
| 467 | select XEN_XENBUS_FRONTEND | ||
| 467 | help | 468 | help |
| 468 | This driver implements the front-end of the Xen virtual | 469 | This driver implements the front-end of the Xen virtual |
| 469 | block device driver. It communicates with a back-end driver | 470 | block device driver. It communicates with a back-end driver |