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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
scsi
/
zalon.c
diff --git
a/drivers/scsi/zalon.c
b/drivers/scsi/zalon.c
index
4b5f908
..
b131432
100644
(file)
--- a/
drivers/scsi/zalon.c
+++ b/
drivers/scsi/zalon.c
@@
-88,7
+88,7
@@
zalon_probe(struct parisc_device *dev)
struct gsc_irq gsc_irq;
u32 zalon_vers;
int error = -ENODEV;
struct gsc_irq gsc_irq;
u32 zalon_vers;
int error = -ENODEV;
- void __iomem *zalon = ioremap
_nocache
(dev->hpa.start, 4096);
+ void __iomem *zalon = ioremap(dev->hpa.start, 4096);
void __iomem *io_port = zalon + GSC_SCSI_ZALON_OFFSET;
static int unit = 0;
struct Scsi_Host *host;
void __iomem *io_port = zalon + GSC_SCSI_ZALON_OFFSET;
static int unit = 0;
struct Scsi_Host *host;
@@
-136,7
+136,7
@@
zalon_probe(struct parisc_device *dev)
if (!host)
goto fail;
if (!host)
goto fail;
- if (request_irq(dev->irq, ncr53c8xx_intr,
IRQF_SHARED
, "zalon", host)) {
+ if (request_irq(dev->irq, ncr53c8xx_intr,
SA_SHIRQ
, "zalon", host)) {
printk(KERN_ERR "%s: irq problem with %d, detaching\n ",
dev->dev.bus_id, dev->irq);
goto fail;
printk(KERN_ERR "%s: irq problem with %d, detaching\n ",
dev->dev.bus_id, dev->irq);
goto fail;