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
/
parisc
/
ccio-dma.c
diff --git
a/drivers/parisc/ccio-dma.c
b/drivers/parisc/ccio-dma.c
index
68cb3a0
..
93f8a8f
100644
(file)
--- a/
drivers/parisc/ccio-dma.c
+++ b/
drivers/parisc/ccio-dma.c
@@
-31,6
+31,7
@@
** the coherency design originally worked out. Only PCX-W does.
*/
** the coherency design originally worked out. Only PCX-W does.
*/
+#include <linux/config.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/mm.h>
@@
-1559,7
+1560,7
@@
static int ccio_probe(struct parisc_device *dev)
*ioc_p = ioc;
ioc->hw_path = dev->hw_path;
*ioc_p = ioc;
ioc->hw_path = dev->hw_path;
- ioc->ioc_regs = ioremap
_nocache
(dev->hpa.start, 4096);
+ ioc->ioc_regs = ioremap(dev->hpa.start, 4096);
ccio_ioc_init(ioc);
ccio_init_resources(ioc);
hppa_dma_ops = &ccio_ops;
ccio_ioc_init(ioc);
ccio_init_resources(ioc);
hppa_dma_ops = &ccio_ops;