diff options
author | Jens Axboe <jaxboe@fusionio.com> | 2011-08-09 14:43:26 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2011-08-09 14:43:26 -0400 |
commit | 40bb96ade4ef1549f387625589175def31dc9023 (patch) | |
tree | 1b02671145e225e54354ffeb0ee7fe2afe3c4339 /drivers/block/Kconfig | |
parent | fa1bf42ff9296ac4cf211b0a1b450a6071d26a95 (diff) | |
parent | ea5e116162b7e0cf83a2b8a273440514404604de (diff) |
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/Kconfig | 2 |
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 | |||
486 | in another domain which drives the actual block device. | 486 | in another domain which drives the actual block device. |
487 | 487 | ||
488 | config XEN_BLKDEV_BACKEND | 488 | config XEN_BLKDEV_BACKEND |
489 | tristate "Block-device backend driver" | 489 | tristate "Xen block-device backend driver" |
490 | depends on XEN_BACKEND | 490 | depends on XEN_BACKEND |
491 | help | 491 | help |
492 | The block-device backend driver allows the kernel to export its | 492 | The block-device backend driver allows the kernel to export its |