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/atari_NCR5380.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/atari_NCR5380.c')
| -rw-r--r-- | drivers/scsi/atari_NCR5380.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c index 2c12be72c4c6..2ae31ceb32a8 100644 --- a/drivers/scsi/atari_NCR5380.c +++ b/drivers/scsi/atari_NCR5380.c | |||
| @@ -255,7 +255,7 @@ | |||
| 255 | */ | 255 | */ |
| 256 | 256 | ||
| 257 | static struct Scsi_Host *first_instance = NULL; | 257 | static struct Scsi_Host *first_instance = NULL; |
| 258 | static Scsi_Host_Template *the_template = NULL; | 258 | static struct scsi_host_template *the_template = NULL; |
| 259 | 259 | ||
| 260 | /* Macros ease life... :-) */ | 260 | /* Macros ease life... :-) */ |
| 261 | #define SETUP_HOSTDATA(in) \ | 261 | #define SETUP_HOSTDATA(in) \ |