diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-31 10:03:19 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-31 10:03:19 -0500 |
| commit | ea19006f583b2128ce8338e6bb43aa0eb724a4b9 (patch) | |
| tree | 4c859976b6acc1301d2c8822be6f21b0381f45fc /drivers/scsi | |
| parent | 8b316a3973f05e572b4edeeda9072987f6bbaa44 (diff) | |
| parent | a0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/lasi700.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/zalon.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c index 459a4daebece..eb7bd310cc82 100644 --- a/drivers/scsi/lasi700.c +++ b/drivers/scsi/lasi700.c | |||
| @@ -112,7 +112,7 @@ lasi700_probe(struct parisc_device *dev) | |||
| 112 | 112 | ||
| 113 | hostdata->dev = &dev->dev; | 113 | hostdata->dev = &dev->dev; |
| 114 | dma_set_mask(&dev->dev, DMA_32BIT_MASK); | 114 | dma_set_mask(&dev->dev, DMA_32BIT_MASK); |
| 115 | hostdata->base = ioremap(base, 0x100); | 115 | hostdata->base = ioremap_nocache(base, 0x100); |
| 116 | hostdata->differential = 0; | 116 | hostdata->differential = 0; |
| 117 | 117 | ||
| 118 | if (dev->id.sversion == LASI_700_SVERSION) { | 118 | if (dev->id.sversion == LASI_700_SVERSION) { |
diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c index b131432c677d..a6cfbb3b361c 100644 --- a/drivers/scsi/zalon.c +++ b/drivers/scsi/zalon.c | |||
| @@ -88,7 +88,7 @@ zalon_probe(struct parisc_device *dev) | |||
| 88 | struct gsc_irq gsc_irq; | 88 | struct gsc_irq gsc_irq; |
| 89 | u32 zalon_vers; | 89 | u32 zalon_vers; |
| 90 | int error = -ENODEV; | 90 | int error = -ENODEV; |
| 91 | void __iomem *zalon = ioremap(dev->hpa.start, 4096); | 91 | void __iomem *zalon = ioremap_nocache(dev->hpa.start, 4096); |
| 92 | void __iomem *io_port = zalon + GSC_SCSI_ZALON_OFFSET; | 92 | void __iomem *io_port = zalon + GSC_SCSI_ZALON_OFFSET; |
| 93 | static int unit = 0; | 93 | static int unit = 0; |
| 94 | struct Scsi_Host *host; | 94 | struct Scsi_Host *host; |