diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 17:04:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 17:04:37 -0500 |
| commit | d72d6f1b5647258e83819b51f72fe37e2b7d7965 (patch) | |
| tree | d3a08af50624d9b3e2287367b7e9f5fcc93bdce5 /drivers/scsi/seagate.c | |
| parent | 33ddcbbfb1d9f1bf1259531ae0ba8400ea3c8ba1 (diff) | |
| parent | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/seagate.c')
| -rw-r--r-- | drivers/scsi/seagate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c index a0cace9aeb79..0ff83ddf13fe 100644 --- a/drivers/scsi/seagate.c +++ b/drivers/scsi/seagate.c | |||
| @@ -418,7 +418,7 @@ static inline void borken_wait (void) | |||
| 418 | #define ULOOP( i ) for (clock = i*8;;) | 418 | #define ULOOP( i ) for (clock = i*8;;) |
| 419 | #define TIMEOUT (!(clock--)) | 419 | #define TIMEOUT (!(clock--)) |
| 420 | 420 | ||
| 421 | int __init seagate_st0x_detect (Scsi_Host_Template * tpnt) | 421 | int __init seagate_st0x_detect (struct scsi_host_template * tpnt) |
| 422 | { | 422 | { |
| 423 | struct Scsi_Host *instance; | 423 | struct Scsi_Host *instance; |
| 424 | int i, j; | 424 | int i, j; |
| @@ -1649,7 +1649,7 @@ static int seagate_st0x_release(struct Scsi_Host *shost) | |||
| 1649 | return 0; | 1649 | return 0; |
| 1650 | } | 1650 | } |
| 1651 | 1651 | ||
| 1652 | static Scsi_Host_Template driver_template = { | 1652 | static struct scsi_host_template driver_template = { |
| 1653 | .detect = seagate_st0x_detect, | 1653 | .detect = seagate_st0x_detect, |
| 1654 | .release = seagate_st0x_release, | 1654 | .release = seagate_st0x_release, |
| 1655 | .info = seagate_st0x_info, | 1655 | .info = seagate_st0x_info, |