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
/
cyberstormII.c
diff --git
a/drivers/scsi/cyberstormII.c
b/drivers/scsi/cyberstormII.c
index
0bd5533
..
d88cb9c
100644
(file)
--- a/
drivers/scsi/cyberstormII.c
+++ b/
drivers/scsi/cyberstormII.c
@@
-27,7
+27,7
@@
#include <linux/interrupt.h>
#include "scsi.h"
#include <linux/interrupt.h>
#include "scsi.h"
-#include
"hosts.h"
+#include
<scsi/scsi_host.h>
#include "NCR53C9x.h"
#include <linux/zorro.h>
#include "NCR53C9x.h"
#include <linux/zorro.h>
@@
-81,7
+81,7
@@
static volatile unsigned char cmd_buffer[16];
*/
/***************************************************************** Detection */
*/
/***************************************************************** Detection */
-int __init cyberII_esp_detect(
Scsi_Host_T
emplate *tpnt)
+int __init cyberII_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;
@@
-153,7
+153,7
@@
int __init cyberII_esp_detect(Scsi_Host_Template *tpnt)
esp->esp_command_dvma = virt_to_bus((void *)cmd_buffer);
esp->irq = IRQ_AMIGA_PORTS;
esp->esp_command_dvma = virt_to_bus((void *)cmd_buffer);
esp->irq = IRQ_AMIGA_PORTS;
- request_irq(IRQ_AMIGA_PORTS, esp_intr,
SA_SHIRQ
,
+ request_irq(IRQ_AMIGA_PORTS, esp_intr,
IRQF_SHARED
,
"CyberStorm SCSI Mk II", esp->ehost);
/* Figure out our scsi ID on the bus */
"CyberStorm SCSI Mk II", esp->ehost);
/* Figure out our scsi ID on the bus */
@@
-200,7
+200,7
@@
static void dma_dump_state(struct NCR_ESP *esp)
esp->esp_id, ((struct cyberII_dma_registers *)
(esp->dregs))->cond_reg));
ESPLOG(("intreq:<%04x>, intena:<%04x>\n",
esp->esp_id, ((struct cyberII_dma_registers *)
(esp->dregs))->cond_reg));
ESPLOG(("intreq:<%04x>, intena:<%04x>\n",
-
custom.intreqr,
custom.intenar));
+
amiga_custom.intreqr, amiga_
custom.intenar));
}
static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length)
}
static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length)
@@
-259,7
+259,7
@@
static void dma_led_on(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)
@@
-290,7
+290,7
@@
int cyberII_esp_release(struct Scsi_Host *instance)
}
}
-static
Scsi_Host_T
emplate driver_template = {
+static
struct scsi_host_t
emplate driver_template = {
.proc_name = "esp-cyberstormII",
.proc_info = esp_proc_info,
.name = "CyberStorm Mk II SCSI",
.proc_name = "esp-cyberstormII",
.proc_info = esp_proc_info,
.name = "CyberStorm Mk II SCSI",