git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
drivers
/
scsi
/
fastlane.c
diff --git
a/drivers/scsi/fastlane.c
b/drivers/scsi/fastlane.c
index
2a1c5c2
..
4266a21
100644
(file)
--- a/
drivers/scsi/fastlane.c
+++ b/
drivers/scsi/fastlane.c
@@
-142,7
+142,7
@@
int __init fastlane_esp_detect(struct scsi_host_template *tpnt)
if (board < 0x1000000) {
goto err_release;
}
- esp = esp_allocate(tpnt, (void *)board
+FASTLANE_ESP_ADDR
);
+ esp = esp_allocate(tpnt, (void *)board
+ FASTLANE_ESP_ADDR, 0
);
/* Do command transfer with programmed I/O */
esp->do_pio_cmds = 1;