summaryrefslogtreecommitdiffstats
path: root/drivers/block/Kconfig
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-08-09 20:43:26 +0200
committerJens Axboe <jaxboe@fusionio.com>2011-08-09 20:43:26 +0200
commit40bb96ade4ef1549f387625589175def31dc9023 (patch)
tree1b02671145e225e54354ffeb0ee7fe2afe3c4339 /drivers/block/Kconfig
parentfa1bf42ff9296ac4cf211b0a1b450a6071d26a95 (diff)
parentea5e116162b7e0cf83a2b8a273440514404604de (diff)
downloadblackbird-obmc-linux-40bb96ade4ef1549f387625589175def31dc9023.tar.gz
blackbird-obmc-linux-40bb96ade4ef1549f387625589175def31dc9023.zip
Merge branch 'stable/for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
Diffstat (limited to 'drivers/block/Kconfig')
-rw-r--r--drivers/block/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 57212c5235e2..6f07ec1c2f58 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -486,7 +486,7 @@ config XEN_BLKDEV_FRONTEND
in another domain which drives the actual block device.
config XEN_BLKDEV_BACKEND
- tristate "Block-device backend driver"
+ tristate "Xen block-device backend driver"
depends on XEN_BACKEND
help
The block-device backend driver allows the kernel to export its
OpenPOWER on IntegriCloud