diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:42:23 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:42:23 -0400 |
| commit | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (patch) | |
| tree | 4c94e70ab846ffcb8bb5715fb3c8d8473358a323 /drivers/scsi/sun3x_esp.c | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
| parent | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (diff) | |
merge by hand (fix up qla_os.c merge error)
Diffstat (limited to 'drivers/scsi/sun3x_esp.c')
| -rw-r--r-- | drivers/scsi/sun3x_esp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c index 5d1dc0e8ba21..09d7639079b4 100644 --- a/drivers/scsi/sun3x_esp.c +++ b/drivers/scsi/sun3x_esp.c | |||
| @@ -23,8 +23,6 @@ | |||
| 23 | #include <asm/dvma.h> | 23 | #include <asm/dvma.h> |
| 24 | #include <asm/irq.h> | 24 | #include <asm/irq.h> |
| 25 | 25 | ||
| 26 | extern struct NCR_ESP *espchain; | ||
| 27 | |||
| 28 | static void dma_barrier(struct NCR_ESP *esp); | 26 | static void dma_barrier(struct NCR_ESP *esp); |
| 29 | static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count); | 27 | static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count); |
| 30 | static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp); | 28 | static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp); |