---

yaml
---
r: 272959
b: refs/heads/master
c: 6190303
h: refs/heads/master
i:
  272957: 4c2e476
  272955: 51b3800
  272951: 52bd578
  272943: 7f2b39c
  272927: bba289f
  272895: 6dc06f5
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a14bf143b317f9c0944bc7aedfd85c07b3b04150
+refs/heads/master: 6190303b4e55ce11774d036f9b90d204223caa1e

trunk/arch/arm/mach-picoxcell/include/mach/io.h

@@ -19,11 +19,4 @@
 /* No PCI possible on picoxcell. */
 #define __mem_pci(a)		(a)
 
-#define __arch_ioremap	picoxcell_ioremap
-#define __arch_iounmap	picoxcell_iounmap
-
-extern void __iomem *picoxcell_ioremap(unsigned long phys, size_t size,
-				       unsigned int type);
-extern void picoxcell_iounmap(volatile void __iomem *addr);
-
 #endif /* __ASM_ARM_ARCH_IO_H */

trunk/arch/arm/mach-picoxcell/io.c

@@ -30,27 +30,3 @@ void __init picoxcell_map_io(void)
 
 	iotable_init(&io_map, 1);
 }
-
-void __iomem *picoxcell_ioremap(unsigned long p, size_t size,
-				unsigned int type)
-{
-	if (unlikely(size == 0))
-		return NULL;
-
-	if (p >= PICOXCELL_PERIPH_BASE &&
-	    p < PICOXCELL_PERIPH_BASE + PICOXCELL_PERIPH_LENGTH)
-		return IO_ADDRESS(p);
-
-	return __arm_ioremap_caller(p, size, type,
-				    __builtin_return_address(0));
-}
-EXPORT_SYMBOL_GPL(picoxcell_ioremap);
-
-void picoxcell_iounmap(volatile void __iomem *addr)
-{
-	unsigned long virt = (unsigned long)addr;
-
-	if (virt >= VMALLOC_START && virt < VMALLOC_END)
-		__iounmap(addr);
-}
-EXPORT_SYMBOL_GPL(picoxcell_iounmap);