diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /drivers/scsi/mac53c94.c | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/scsi/mac53c94.c')
| -rw-r--r-- | drivers/scsi/mac53c94.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c index 89ef34df5a1d..6422de72bf43 100644 --- a/drivers/scsi/mac53c94.c +++ b/drivers/scsi/mac53c94.c | |||
| @@ -431,7 +431,7 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat | |||
| 431 | struct fsc_state *state; | 431 | struct fsc_state *state; |
| 432 | struct Scsi_Host *host; | 432 | struct Scsi_Host *host; |
| 433 | void *dma_cmd_space; | 433 | void *dma_cmd_space; |
| 434 | unsigned char *clkprop; | 434 | const unsigned char *clkprop; |
| 435 | int proplen, rc = -ENODEV; | 435 | int proplen, rc = -ENODEV; |
| 436 | 436 | ||
| 437 | if (macio_resource_count(mdev) != 2 || macio_irq_count(mdev) != 2) { | 437 | if (macio_resource_count(mdev) != 2 || macio_irq_count(mdev) != 2) { |