From: Andrew Morton <akpm@osdl.org>

on powerpc:

In file included from drivers/infiniband/hw/amso1100/c2.c:55:
drivers/infiniband/hw/amso1100/c2.h:421: error: conflicting types for '__raw_writeq'
include/asm/io.h:111: error: previous definition of '__raw_writeq' was here

Cc: Tom Tucker <tom@opengridcomputing.com>
Cc: Steve Wise <swise@opengridcomputing.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/infiniband/hw/amso1100/c2.h |   19 -------------------
 1 file changed, 19 deletions(-)

diff -puN drivers/infiniband/hw/amso1100/c2.h~amso1100-build-fix drivers/infiniband/hw/amso1100/c2.h
--- a/drivers/infiniband/hw/amso1100/c2.h~amso1100-build-fix
+++ a/drivers/infiniband/hw/amso1100/c2.h
@@ -405,25 +405,6 @@ struct c2_port {
  */
 #define C2_ADAPTER_PCI_REGS_OFFSET 0x10000
 
-#ifndef readq
-static inline u64 readq(const void __iomem * addr)
-{
-	u64 ret = readl(addr + 4);
-	ret <<= 32;
-	ret |= readl(addr);
-
-	return ret;
-}
-#endif
-
-#ifndef __raw_writeq
-static inline void __raw_writeq(u64 val, void __iomem * addr)
-{
-	__raw_writel((u32) (val), addr);
-	__raw_writel((u32) (val >> 32), (addr + 4));
-}
-#endif
-
 #define C2_SET_CUR_RX(c2dev, cur_rx) \
 	__raw_writel(cpu_to_be32(cur_rx), c2dev->mmio_txp_ring + 4092)
 
_