projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
drivers
/
scsi
/
cyberstorm.c
diff --git
a/drivers/scsi/cyberstorm.c
b/drivers/scsi/cyberstorm.c
index
7c7cfb5
..
c6b98a4
100644
(file)
--- a/
drivers/scsi/cyberstorm.c
+++ b/
drivers/scsi/cyberstorm.c
@@
-126,7
+126,7
@@
int __init cyber_esp_detect(struct scsi_host_template *tpnt)
sizeof(struct ESP_regs));
return 0;
}
- esp = esp_allocate(tpnt, (void *)board
+CYBER_ESP_ADDR
);
+ esp = esp_allocate(tpnt, (void *)board
+ CYBER_ESP_ADDR, 0
);
/* Do command transfer with programmed I/O */
esp->do_pio_cmds = 1;