diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 23:33:50 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 23:33:50 +0400 |
| commit | c28cfd60e4ec3f494b73ef7d6c661f5f491cd84f (patch) | |
| tree | 390c23c07b4f484528b6fa5a72bae1b879df35b1 /drivers/scsi | |
| parent | dfa4a423cf80afe8f81a36d8e663961c4acca343 (diff) | |
| parent | 44231e686b2ba3b5702db867bb84e6d76b7cf2c7 (diff) | |
| download | linux-c28cfd60e4ec3f494b73ef7d6c661f5f491cd84f.tar.xz | |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
* 'for-linus' of git://git.open-osd.org/linux-open-osd: (21 commits)
ore: Enable RAID5 mounts
exofs: Support for RAID5 read-4-write interface.
ore: RAID5 Write
ore: RAID5 read
fs/Makefile: Always inspect exofs/
ore: Make ore_calc_stripe_info EXPORT_SYMBOL
ore/exofs: Change ore_check_io API
ore/exofs: Define new ore_verify_layout
ore: Support for partial component table
ore: Support for short read/writes
exofs: Support for short read/writes
ore: Remove check for ios->kern_buff in _prepare_for_striping to later
ore: cleanup: Embed an ore_striping_info inside ore_io_state
ore: Only IO one group at a time (API change)
ore/exofs: Change the type of the devices array (API change)
ore: Make ore_striping_info and ore_calc_stripe_info public
exofs: Remove unused data_map member from exofs_sb_info
exofs: Rename struct ore_components comps => oc
exofs/super.c: local functions should be static
exofs/ore.c: local functions should be static
...
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/osd/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/osd/Kconfig b/drivers/scsi/osd/Kconfig index 861b5cebaeae..a0703514eb0f 100644 --- a/drivers/scsi/osd/Kconfig +++ b/drivers/scsi/osd/Kconfig @@ -11,10 +11,6 @@ # it under the terms of the GNU General Public version 2 License as # published by the Free Software Foundation # -# FIXME: SCSI_OSD_INITIATOR should select CONFIG (HMAC) SHA1 somehow. -# How is it done properly? -# - config SCSI_OSD_INITIATOR tristate "OSD-Initiator library" depends on SCSI |