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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
scsi
/
fastlane.c
diff --git
a/drivers/scsi/fastlane.c
b/drivers/scsi/fastlane.c
index
ae47612
..
8ae9c40
100644
(file)
--- a/
drivers/scsi/fastlane.c
+++ b/
drivers/scsi/fastlane.c
@@
-125,7
+125,7
@@
static inline void dma_clear(struct NCR_ESP *esp)
}
/***************************************************************** Detection */
}
/***************************************************************** Detection */
-int __init fastlane_esp_detect(
Scsi_Host_T
emplate *tpnt)
+int __init fastlane_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;
@@
-268,7
+268,7
@@
static void dma_dump_state(struct NCR_ESP *esp)
esp->esp_id, ((struct fastlane_dma_registers *)
(esp->dregs))->cond_reg));
ESPLOG(("intreq:<%04x>, intena:<%04x>\n",
esp->esp_id, ((struct fastlane_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)
@@
-368,7
+368,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)
@@
-398,7
+398,7
@@
int fastlane_esp_release(struct Scsi_Host *instance)
}
}
-static
Scsi_Host_T
emplate driver_template = {
+static
struct scsi_host_t
emplate driver_template = {
.proc_name = "esp-fastlane",
.proc_info = esp_proc_info,
.name = "Fastlane SCSI",
.proc_name = "esp-fastlane",
.proc_info = esp_proc_info,
.name = "Fastlane SCSI",