diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-13 10:19:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-13 10:19:23 +0100 |
| commit | 4bd93343124ffe3bdc21c2b485c2668aba6651be (patch) | |
| tree | 4dd0ce9dd93b3ed8bce9126e4407207fb01839cd /drivers/block/Kconfig | |
| parent | 19c2c5f55e31ac8da87bb8efe0cf86aa933e6a2f (diff) | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
| download | lwn-4bd93343124ffe3bdc21c2b485c2668aba6651be.tar.gz lwn-4bd93343124ffe3bdc21c2b485c2668aba6651be.zip | |
Merge tag 'v3.11-rc5' into asoc-dapm
Linux 3.11-rc5
Diffstat (limited to 'drivers/block/Kconfig')
| -rw-r--r-- | drivers/block/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index b81ddfea1da0..e07a5fd58ad7 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -532,11 +532,11 @@ config BLK_DEV_RBD If unsure, say N. config BLK_DEV_RSXX - tristate "IBM FlashSystem 70/80 PCIe SSD Device Driver" + tristate "IBM Flash Adapter 900GB Full Height PCIe Device Driver" depends on PCI help Device driver for IBM's high speed PCIe SSD - storage devices: FlashSystem-70 and FlashSystem-80. + storage device: Flash Adapter 900GB Full Height. To compile this driver as a module, choose M here: the module will be called rsxx. |