diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 16:21:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 16:21:02 -0700 |
| commit | 940155309cd037d3a49ad01276e591b872e8a832 (patch) | |
| tree | 209d660d00d5e8bb2b74c8e529a8ec4ced411e26 /drivers | |
| parent | 42fae7fb1c27d230fbd48aa055a4ae6796fb0039 (diff) | |
| parent | e1f2a094bdfa8e7ecc31f048e6c6dbea2b4f5f74 (diff) | |
| download | op-kernel-dev-940155309cd037d3a49ad01276e591b872e8a832.zip op-kernel-dev-940155309cd037d3a49ad01276e591b872e8a832.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SCSI] esp_scsi.c: Fix compilation.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/esp_scsi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c index 3cd5bf7..99ce033 100644 --- a/drivers/scsi/esp_scsi.c +++ b/drivers/scsi/esp_scsi.c @@ -13,6 +13,7 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/init.h> +#include <linux/irqreturn.h> #include <asm/irq.h> #include <asm/io.h> @@ -1706,17 +1707,17 @@ again: if (!dma_len) { printk(KERN_ERR PFX "esp%d: DMA length is zero!\n", esp->host->unique_id); - printk(KERN_ERR PFX "esp%d: cur adr[%08x] len[%08x]\n", + printk(KERN_ERR PFX "esp%d: cur adr[%08llx] len[%08x]\n", esp->host->unique_id, - esp_cur_dma_addr(ent, cmd), + (unsigned long long)esp_cur_dma_addr(ent, cmd), esp_cur_dma_len(ent, cmd)); esp_schedule_reset(esp); return 0; } - esp_log_datastart("ESP: start data addr[%08x] len[%u] " + esp_log_datastart("ESP: start data addr[%08llx] len[%u] " "write(%d)\n", - dma_addr, dma_len, write); + (unsigned long long)dma_addr, dma_len, write); esp->ops->send_dma_cmd(esp, dma_addr, dma_len, dma_len, write, ESP_CMD_DMA | ESP_CMD_TI); |
