git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
scsi
/
blz1230.c
diff --git
a/drivers/scsi/blz1230.c
b/drivers/scsi/blz1230.c
index
4cd9fcf
..
329a8f2
100644
(file)
--- a/
drivers/scsi/blz1230.c
+++ b/
drivers/scsi/blz1230.c
@@
-94,7
+94,7
@@
static volatile unsigned char cmd_buffer[16];
*/
/***************************************************************** Detection */
*/
/***************************************************************** Detection */
-int __init blz1230_esp_detect(
Scsi_Host_T
emplate *tpnt)
+int __init blz1230_esp_detect(
struct scsi_host_t
emplate *tpnt)
{
struct NCR_ESP *esp;
struct zorro_dev *z = NULL;
{
struct NCR_ESP *esp;
struct zorro_dev *z = NULL;
@@
-172,7
+172,7
@@
int __init blz1230_esp_detect(Scsi_Host_Template *tpnt)
esp->irq = IRQ_AMIGA_PORTS;
esp->slot = board+REAL_BLZ1230_ESP_ADDR;
esp->irq = IRQ_AMIGA_PORTS;
esp->slot = board+REAL_BLZ1230_ESP_ADDR;
- if (request_irq(IRQ_AMIGA_PORTS, esp_intr,
SA_SHIRQ
,
+ if (request_irq(IRQ_AMIGA_PORTS, esp_intr,
IRQF_SHARED
,
"Blizzard 1230 SCSI IV", esp->ehost))
goto err_out;
"Blizzard 1230 SCSI IV", esp->ehost))
goto err_out;
@@
-224,7
+224,7
@@
static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp)
static void dma_dump_state(struct NCR_ESP *esp)
{
ESPLOG(("intreq:<%04x>, intena:<%04x>\n",
static void dma_dump_state(struct NCR_ESP *esp)
{
ESPLOG(("intreq:<%04x>, intena:<%04x>\n",
-
custom.intreqr,
custom.intenar));
+
amiga_custom.intreqr, amiga_
custom.intenar));
}
void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length)
}
void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length)
@@
-298,7
+298,7
@@
static int dma_irq_p(struct NCR_ESP *esp)
static int dma_ports_p(struct NCR_ESP *esp)
{
static int dma_ports_p(struct NCR_ESP *esp)
{
- return ((custom.intenar) & IF_PORTS);
+ return ((
amiga_
custom.intenar) & IF_PORTS);
}
static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
}
static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
@@
-328,7
+328,7
@@
int blz1230_esp_release(struct Scsi_Host *instance)
}
}
-static
Scsi_Host_T
emplate driver_template = {
+static
struct scsi_host_t
emplate driver_template = {
.proc_name = "esp-blz1230",
.proc_info = esp_proc_info,
.name = "Blizzard1230 SCSI IV",
.proc_name = "esp-blz1230",
.proc_info = esp_proc_info,
.name = "Blizzard1230 SCSI IV",