From 60c119813c46a625cbe98e9c773c0ede67be58ed Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie@jamieiles.com>
Date: Fri, 16 Sep 2011 14:26:18 +0100
Subject: [PATCH] --- yaml --- r: 272959 b: refs/heads/master c:
 6190303b4e55ce11774d036f9b90d204223caa1e h: refs/heads/master i:   272957:
 4c2e476db5ab50b08bc7b36eb17d10363cfe81e2   272955:
 51b380009d5ccbd5d7fdd31f26d11a3ae562eb08   272951:
 52bd578290064d316b6ae9b9a10f337dff605702   272943:
 7f2b39c3e02be45d0996417cd6b897930ac6bcf1   272927:
 bba289f6566c1880b0204a84d59a887e6da9fc1f   272895:
 6dc06f51036516f1b7ceef01ba174940e74d9c2a v: v3

---
 [refs]                                        |  2 +-
 .../arch/arm/mach-picoxcell/include/mach/io.h |  7 ------
 .../arm/mach-picoxcell/include/mach/vmalloc.h | 18 --------------
 trunk/arch/arm/mach-picoxcell/io.c            | 24 -------------------
 4 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 trunk/arch/arm/mach-picoxcell/include/mach/vmalloc.h

diff --git a/[refs] b/[refs]
index 922c22c65f4e..eac4bd33744e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a14bf143b317f9c0944bc7aedfd85c07b3b04150
+refs/heads/master: 6190303b4e55ce11774d036f9b90d204223caa1e
diff --git a/trunk/arch/arm/mach-picoxcell/include/mach/io.h b/trunk/arch/arm/mach-picoxcell/include/mach/io.h
index a863b0f6eeec..7573ec7d10a3 100644
--- a/trunk/arch/arm/mach-picoxcell/include/mach/io.h
+++ b/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 */
diff --git a/trunk/arch/arm/mach-picoxcell/include/mach/vmalloc.h b/trunk/arch/arm/mach-picoxcell/include/mach/vmalloc.h
deleted file mode 100644
index 62559e30888a..000000000000
--- a/trunk/arch/arm/mach-picoxcell/include/mach/vmalloc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2011 Picochip Ltd., Jamie Iles
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#define VMALLOC_END		0xFE000000UL
diff --git a/trunk/arch/arm/mach-picoxcell/io.c b/trunk/arch/arm/mach-picoxcell/io.c
index 935a2fae62e6..39e9b9e8cc37 100644
--- a/trunk/arch/arm/mach-picoxcell/io.c
+++ b/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);