projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
[powerpc.git]
/
include
/
asm-x86_64
/
io.h
diff --git
a/include/asm-x86_64/io.h
b/include/asm-x86_64/io.h
index
6ee9fad
..
de2cd9a
100644
(file)
--- a/
include/asm-x86_64/io.h
+++ b/
include/asm-x86_64/io.h
@@
-100,7
+100,7
@@
__OUTS(l)
#define IO_SPACE_LIMIT 0xffff
#define IO_SPACE_LIMIT 0xffff
-#if defined(__KERNEL__) &&
__x86_64__
+#if defined(__KERNEL__) &&
defined(__x86_64__)
#include <linux/vmalloc.h>
#include <linux/vmalloc.h>
@@
-248,12
+248,6
@@
void memset_io(volatile void __iomem *a, int b, size_t c);
*/
#define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET))
*/
#define __ISA_IO_base ((char __iomem *)(PAGE_OFFSET))
-/*
- * Again, x86-64 does not require mem IO specific function.
- */
-
-#define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void *)(b),(c),(d))
-
/* Nothing to do */
#define dma_cache_inv(_start,_size) do { } while (0)
/* Nothing to do */
#define dma_cache_inv(_start,_size) do { } while (0)