diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2007-04-27 18:19:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-04-27 18:19:27 -0400 |
commit | e1f2a094bdfa8e7ecc31f048e6c6dbea2b4f5f74 (patch) | |
tree | 779a306c7554fb0d68dab533331a5d396496a190 /drivers/scsi/esp_scsi.c | |
parent | 50f732ee63b91eb08a29974b36bd63e1150bb642 (diff) |
[SCSI] esp_scsi.c: Fix compilation.
irqreturn.h for irqreturn_t and dma_addr_t being u128 warnings ;-)
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/esp_scsi.c')
-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 3cd5bf723da4..99ce03331b64 100644 --- a/drivers/scsi/esp_scsi.c +++ b/drivers/scsi/esp_scsi.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
14 | #include <linux/moduleparam.h> | 14 | #include <linux/moduleparam.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/irqreturn.h> | ||
16 | 17 | ||
17 | #include <asm/irq.h> | 18 | #include <asm/irq.h> |
18 | #include <asm/io.h> | 19 | #include <asm/io.h> |
@@ -1706,17 +1707,17 @@ again: | |||
1706 | if (!dma_len) { | 1707 | if (!dma_len) { |
1707 | printk(KERN_ERR PFX "esp%d: DMA length is zero!\n", | 1708 | printk(KERN_ERR PFX "esp%d: DMA length is zero!\n", |
1708 | esp->host->unique_id); | 1709 | esp->host->unique_id); |
1709 | printk(KERN_ERR PFX "esp%d: cur adr[%08x] len[%08x]\n", | 1710 | printk(KERN_ERR PFX "esp%d: cur adr[%08llx] len[%08x]\n", |
1710 | esp->host->unique_id, | 1711 | esp->host->unique_id, |
1711 | esp_cur_dma_addr(ent, cmd), | 1712 | (unsigned long long)esp_cur_dma_addr(ent, cmd), |
1712 | esp_cur_dma_len(ent, cmd)); | 1713 | esp_cur_dma_len(ent, cmd)); |
1713 | esp_schedule_reset(esp); | 1714 | esp_schedule_reset(esp); |
1714 | return 0; | 1715 | return 0; |
1715 | } | 1716 | } |
1716 | 1717 | ||
1717 | esp_log_datastart("ESP: start data addr[%08x] len[%u] " | 1718 | esp_log_datastart("ESP: start data addr[%08llx] len[%u] " |
1718 | "write(%d)\n", | 1719 | "write(%d)\n", |
1719 | dma_addr, dma_len, write); | 1720 | (unsigned long long)dma_addr, dma_len, write); |
1720 | 1721 | ||
1721 | esp->ops->send_dma_cmd(esp, dma_addr, dma_len, dma_len, | 1722 | esp->ops->send_dma_cmd(esp, dma_addr, dma_len, dma_len, |
1722 | write, ESP_CMD_DMA | ESP_CMD_TI); | 1723 | write, ESP_CMD_DMA | ESP_CMD_TI); |