diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-01-15 10:39:35 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-01-15 10:39:35 +0100 |
| commit | 85a0f7b220777cd3c232fd2f079db5c4a874c4ee (patch) | |
| tree | 5d238aaf0f5a49fd2fa815528de86fa4170964b0 /drivers/block/Kconfig | |
| parent | f748040bb875a0d94c3ceef180ab704bdf43079f (diff) | |
| parent | 62ee8c13e26cffe6483630f59932c3e936dfb586 (diff) | |
| download | linux-85a0f7b220777cd3c232fd2f079db5c4a874c4ee.tar.bz2 | |
Merge branch 'for-3.3/mtip32xx' into for-3.3/drivers
Diffstat (limited to 'drivers/block/Kconfig')
| -rw-r--r-- | drivers/block/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 6f07ec1c2f58..a30aa103f95b 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -116,6 +116,8 @@ config PARIDE source "drivers/block/paride/Kconfig" +source "drivers/block/mtip32xx/Kconfig" + config BLK_CPQ_DA tristate "Compaq SMART2 support" depends on PCI && VIRT_TO_BUS |