diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 07:26:32 +0100 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 07:26:32 +0100 |
commit | b22364c8eec89e6b0c081a237f3b6348df87796f (patch) | |
tree | 233a923281fb640106465d076997ff511efb6edf /include/asm-ppc/io.h | |
parent | Input: ads7846 - be more compatible with the hwmon framework (diff) | |
parent | libata: kill ATA_ENABLE_PATA (diff) | |
download | linux-b22364c8eec89e6b0c081a237f3b6348df87796f.tar.xz linux-b22364c8eec89e6b0c081a237f3b6348df87796f.zip |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-ppc/io.h')
-rw-r--r-- | include/asm-ppc/io.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h index ccf1a9bb2e43..95d590423cf2 100644 --- a/include/asm-ppc/io.h +++ b/include/asm-ppc/io.h @@ -358,8 +358,6 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int } #endif -#define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void __force *)(void __iomem *)(b),(c),(d)) - /* * Map in an area of physical address space, for accessing * I/O devices etc. |