diff options
| author | Thomas Schwinge <tschwinge@gnu.org> | 2006-10-08 13:47:28 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:26:42 +0200 |
| commit | 7cad6f7211281c8be1e92f85b6181c3d9d2665e7 (patch) | |
| tree | f43de5b7c4d9a4781c4edc17657731297a360010 /linux/src | |
| parent | 143ee06bfad83cdf9395da4c975668086e41cf4a (diff) | |
2006-10-08 Thomas Schwinge <tschwinge@gnu.org>
* linux/dev/drivers/scsi/sr.c: Move file...
* linux/src/drivers/scsi/sr.c: ... here.
Diffstat (limited to 'linux/src')
| -rw-r--r-- | linux/src/drivers/scsi/sr.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/linux/src/drivers/scsi/sr.c b/linux/src/drivers/scsi/sr.c index 446a221..8f44246 100644 --- a/linux/src/drivers/scsi/sr.c +++ b/linux/src/drivers/scsi/sr.c @@ -1005,8 +1005,12 @@ void requeue_sr_request (Scsi_Cmnd * SCpnt) static int sr_detect(Scsi_Device * SDp){ if(SDp->type != TYPE_ROM && SDp->type != TYPE_WORM) return 0; - - printk("Detected scsi CD-ROM sr%d at scsi%d, channel %d, id %d, lun %d\n", + +#ifdef MACH + printk("Detected scsi CD-ROM cd%d at scsi%d, channel %d, id %d, lun %d\n", +#else + printk("Detected scsi CD-ROM sr%d at scsi%d, channel %d, id %d, lun %d\n", +#endif sr_template.dev_noticed++, SDp->host->host_no, SDp->channel, SDp->id, SDp->lun); @@ -1117,8 +1121,13 @@ void get_sectorsize(int i){ case 512: break; default: +#ifdef MACH + printk ("cd%d : unsupported sector size %d.\n", + i, scsi_CDs[i].sector_size); +#else printk ("scd%d : unsupported sector size %d.\n", i, scsi_CDs[i].sector_size); +#endif scsi_CDs[i].capacity = 0; scsi_CDs[i].needs_sector_size = 1; } |