diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:30:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:30:12 -0500 |
| commit | f61ea1b0c825a20a1826bb43a226387091934586 (patch) | |
| tree | fdedf0a2368f707e3fd5205db05bfcbac79606ec /drivers/scsi/scsi_scan.c | |
| parent | d347da0deffa1d8f88f0d270eab040e4707c9916 (diff) | |
| parent | 7b32b8e018d8f8cc94c808a5fa84a3f889441b91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 4e6709f448e1..05ebb9cef961 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
| @@ -74,7 +74,7 @@ | |||
| 74 | #define SCSI_SCAN_TARGET_PRESENT 1 | 74 | #define SCSI_SCAN_TARGET_PRESENT 1 |
| 75 | #define SCSI_SCAN_LUN_PRESENT 2 | 75 | #define SCSI_SCAN_LUN_PRESENT 2 |
| 76 | 76 | ||
| 77 | static char *scsi_null_device_strs = "nullnullnullnull"; | 77 | static const char *scsi_null_device_strs = "nullnullnullnull"; |
| 78 | 78 | ||
| 79 | #define MAX_SCSI_LUNS 512 | 79 | #define MAX_SCSI_LUNS 512 |
| 80 | 80 | ||