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
/
lasi700.c
diff --git
a/drivers/scsi/lasi700.c
b/drivers/scsi/lasi700.c
index
4cbb618
..
eb7bd31
100644
(file)
--- a/
drivers/scsi/lasi700.c
+++ b/
drivers/scsi/lasi700.c
@@
-98,7
+98,7
@@
MODULE_DEVICE_TABLE(parisc, lasi700_ids);
static int __init
lasi700_probe(struct parisc_device *dev)
{
static int __init
lasi700_probe(struct parisc_device *dev)
{
- unsigned long base = dev->hpa + LASI_SCSI_CORE_OFFSET;
+ unsigned long base = dev->hpa
.start
+ LASI_SCSI_CORE_OFFSET;
struct NCR_700_Host_Parameters *hostdata;
struct Scsi_Host *host;
struct NCR_700_Host_Parameters *hostdata;
struct Scsi_Host *host;
@@
-112,7
+112,7
@@
lasi700_probe(struct parisc_device *dev)
hostdata->dev = &dev->dev;
dma_set_mask(&dev->dev, DMA_32BIT_MASK);
hostdata->dev = &dev->dev;
dma_set_mask(&dev->dev, DMA_32BIT_MASK);
- hostdata->base = ioremap(base, 0x100);
+ hostdata->base = ioremap
_nocache
(base, 0x100);
hostdata->differential = 0;
if (dev->id.sversion == LASI_700_SVERSION) {
hostdata->differential = 0;
if (dev->id.sversion == LASI_700_SVERSION) {
@@
-125,8
+125,6
@@
lasi700_probe(struct parisc_device *dev)
hostdata->dmode_extra = DMODE_FC2;
}
hostdata->dmode_extra = DMODE_FC2;
}
- NCR_700_set_mem_mapped(hostdata);
-
host = NCR_700_detect(&lasi700_template, hostdata, &dev->dev);
if (!host)
goto out_kfree;
host = NCR_700_detect(&lasi700_template, hostdata, &dev->dev);
if (!host)
goto out_kfree;
@@
-168,7
+166,7
@@
lasi700_driver_remove(struct parisc_device *dev)
}
static struct parisc_driver lasi700_driver = {
}
static struct parisc_driver lasi700_driver = {
- .name = "
Lasi SCSI
",
+ .name = "
lasi_scsi
",
.id_table = lasi700_ids,
.probe = lasi700_probe,
.remove = __devexit_p(lasi700_driver_remove),
.id_table = lasi700_ids,
.probe = lasi700_probe,
.remove = __devexit_p(lasi700_driver_remove),