diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-12-01 16:18:56 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-12-01 16:18:56 -0500 |
| commit | c99da91e7a12724127475a85cc7a38214b3504e2 (patch) | |
| tree | de0eb3fe32ce58804457963fd133a53bb8fba5b8 /drivers/scsi/zorro7xx.c | |
| parent | a31e23e15cbb9734c5883a4a7f58d8712d303e0b (diff) | |
| parent | 92d499d991ec4f5cbd00d6f33967eab9d3ee8d6c (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/zorro7xx.c')
| -rw-r--r-- | drivers/scsi/zorro7xx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/zorro7xx.c b/drivers/scsi/zorro7xx.c index ac67394c7373..64d40a2d4d4d 100644 --- a/drivers/scsi/zorro7xx.c +++ b/drivers/scsi/zorro7xx.c | |||
| @@ -13,7 +13,10 @@ | |||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 15 | #include <linux/zorro.h> | 15 | #include <linux/zorro.h> |
| 16 | |||
| 17 | #include <asm/amigahw.h> | ||
| 16 | #include <asm/amigaints.h> | 18 | #include <asm/amigaints.h> |
| 19 | |||
| 17 | #include <scsi/scsi_host.h> | 20 | #include <scsi/scsi_host.h> |
| 18 | #include <scsi/scsi_transport_spi.h> | 21 | #include <scsi/scsi_transport_spi.h> |
| 19 | 22 | ||