diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/scsi/NCR5380.h | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/NCR5380.h')
| -rw-r--r-- | drivers/scsi/NCR5380.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h index c3462e358d1c..1bc73de496b0 100644 --- a/drivers/scsi/NCR5380.h +++ b/drivers/scsi/NCR5380.h | |||
| @@ -296,7 +296,7 @@ static int NCR5380_init(struct Scsi_Host *instance, int flags); | |||
| 296 | static void NCR5380_exit(struct Scsi_Host *instance); | 296 | static void NCR5380_exit(struct Scsi_Host *instance); |
| 297 | static void NCR5380_information_transfer(struct Scsi_Host *instance); | 297 | static void NCR5380_information_transfer(struct Scsi_Host *instance); |
| 298 | #ifndef DONT_USE_INTR | 298 | #ifndef DONT_USE_INTR |
| 299 | static irqreturn_t NCR5380_intr(int irq, void *dev_id, struct pt_regs *regs); | 299 | static irqreturn_t NCR5380_intr(int irq, void *dev_id); |
| 300 | #endif | 300 | #endif |
| 301 | static void NCR5380_main(void *ptr); | 301 | static void NCR5380_main(void *ptr); |
| 302 | static void NCR5380_print_options(struct Scsi_Host *instance); | 302 | static void NCR5380_print_options(struct Scsi_Host *instance); |