git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[sfrench/cifs-2.6.git]
/
drivers
/
parisc
/
ccio-dma.c
diff --git
a/drivers/parisc/ccio-dma.c
b/drivers/parisc/ccio-dma.c
index 93f8a8fa889014deba28a42601494176aec9f278..a5d826237b265a0b683e0b2bbea513c33e11cc34 100644
(file)
--- a/
drivers/parisc/ccio-dma.c
+++ b/
drivers/parisc/ccio-dma.c
@@
-1560,7
+1560,7
@@
static int ccio_probe(struct parisc_device *dev)
*ioc_p = ioc;
ioc->hw_path = dev->hw_path;
- ioc->ioc_regs = ioremap(dev->hpa.start, 4096);
+ ioc->ioc_regs = ioremap
_nocache
(dev->hpa.start, 4096);
ccio_ioc_init(ioc);
ccio_init_resources(ioc);
hppa_dma_ops = &ccio_ops;