Merge branch 'master'
This commit is contained in:
@@ -112,7 +112,7 @@ lasi700_probe(struct parisc_device *dev)
|
||||
|
||||
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) {
|
||||
|
||||
@@ -88,7 +88,7 @@ zalon_probe(struct parisc_device *dev)
|
||||
struct gsc_irq gsc_irq;
|
||||
u32 zalon_vers;
|
||||
int error = -ENODEV;
|
||||
void __iomem *zalon = ioremap(dev->hpa.start, 4096);
|
||||
void __iomem *zalon = ioremap_nocache(dev->hpa.start, 4096);
|
||||
void __iomem *io_port = zalon + GSC_SCSI_ZALON_OFFSET;
|
||||
static int unit = 0;
|
||||
struct Scsi_Host *host;
|
||||
|
||||
Reference in New Issue
Block a user