projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
include
/
asm-cris
/
io.h
diff --git
a/include/asm-cris/io.h
b/include/asm-cris/io.h
index
16e791b
..
d196dd6
100644
(file)
--- a/
include/asm-cris/io.h
+++ b/
include/asm-cris/io.h
@@
-23,12
+23,12
@@
extern struct cris_io_operations *cris_iops;
* Change virtual addresses to physical addresses and vv.
*/
* Change virtual addresses to physical addresses and vv.
*/
-
extern
inline unsigned long virt_to_phys(volatile void * address)
+
static
inline unsigned long virt_to_phys(volatile void * address)
{
return __pa(address);
}
{
return __pa(address);
}
-
extern
inline void * phys_to_virt(unsigned long address)
+
static
inline void * phys_to_virt(unsigned long address)
{
return __va(address);
}
{
return __va(address);
}
@@
-36,7
+36,7
@@
extern inline void * phys_to_virt(unsigned long address)
extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
extern void __iomem * __ioremap_prot(unsigned long phys_addr, unsigned long size, pgprot_t prot);
extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
extern void __iomem * __ioremap_prot(unsigned long phys_addr, unsigned long size, pgprot_t prot);
-
extern
inline void __iomem * ioremap (unsigned long offset, unsigned long size)
+
static
inline void __iomem * ioremap (unsigned long offset, unsigned long size)
{
return __ioremap(offset, size, 0);
}
{
return __ioremap(offset, size, 0);
}
@@
-121,11
+121,6
@@
static inline void writel(unsigned int b, volatile void __iomem *addr)
#define memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c))
#define memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c))
#define memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c))
#define memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c))
-/*
- * Again, CRIS does not require mem IO specific function.
- */
-
-#define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void __force *)(b),(c),(d))
/* The following is junk needed for the arch-independent code but which
* we never use in the CRIS port
/* The following is junk needed for the arch-independent code but which
* we never use in the CRIS port