Commit 8482a0ab authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

SCSI fixes from James Bottomley:
 "There's just a single fix in here: the osd max device number fix."

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576
parents 233ba2c5 41f8ad76
...@@ -69,10 +69,10 @@ ...@@ -69,10 +69,10 @@
#ifndef SCSI_OSD_MAJOR #ifndef SCSI_OSD_MAJOR
# define SCSI_OSD_MAJOR 260 # define SCSI_OSD_MAJOR 260
#endif #endif
#define SCSI_OSD_MAX_MINOR 64 #define SCSI_OSD_MAX_MINOR MINORMASK
static const char osd_name[] = "osd"; static const char osd_name[] = "osd";
static const char *osd_version_string = "open-osd 0.2.0"; static const char *osd_version_string = "open-osd 0.2.1";
MODULE_AUTHOR("Boaz Harrosh <bharrosh@panasas.com>"); MODULE_AUTHOR("Boaz Harrosh <bharrosh@panasas.com>");
MODULE_DESCRIPTION("open-osd Upper-Layer-Driver osd.ko"); MODULE_DESCRIPTION("open-osd Upper-Layer-Driver osd.ko");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment