From 7d5499ba75c6bf18c09be4b067fe829ee99aa878 Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie@jamieiles.com>
Date: Mon, 12 Dec 2011 20:21:39 +0000
Subject: [PATCH] --- yaml --- r: 281544 b: refs/heads/master c:
 8f37a0b49656ed961598351da3ebdd89f2d2e5b4 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/arm/mach-picoxcell/Makefile |  1 -
 trunk/arch/arm/mach-picoxcell/common.c | 13 +++++++++++
 trunk/arch/arm/mach-picoxcell/common.h |  1 -
 trunk/arch/arm/mach-picoxcell/io.c     | 32 --------------------------
 5 files changed, 14 insertions(+), 35 deletions(-)
 delete mode 100644 trunk/arch/arm/mach-picoxcell/io.c

diff --git a/[refs] b/[refs]
index 87344442b7ac..0e22bfb22459 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98e27a5c13badb5c56d9d1d6c8ec210753ac1195
+refs/heads/master: 8f37a0b49656ed961598351da3ebdd89f2d2e5b4
diff --git a/trunk/arch/arm/mach-picoxcell/Makefile b/trunk/arch/arm/mach-picoxcell/Makefile
index c550b6363488..e5ec4a8d9bcb 100644
--- a/trunk/arch/arm/mach-picoxcell/Makefile
+++ b/trunk/arch/arm/mach-picoxcell/Makefile
@@ -1,3 +1,2 @@
 obj-y	:= common.o
 obj-y	+= time.o
-obj-y	+= io.o
diff --git a/trunk/arch/arm/mach-picoxcell/common.c b/trunk/arch/arm/mach-picoxcell/common.c
index d34b3335801e..febee47bc116 100644
--- a/trunk/arch/arm/mach-picoxcell/common.c
+++ b/trunk/arch/arm/mach-picoxcell/common.c
@@ -16,12 +16,25 @@
 
 #include <asm/mach/arch.h>
 #include <asm/hardware/vic.h>
+#include <asm/mach/map.h>
 
 #include <mach/map.h>
 #include <mach/picoxcell_soc.h>
 
 #include "common.h"
 
+static struct map_desc io_map __initdata = {
+	.virtual	= PHYS_TO_IO(PICOXCELL_PERIPH_BASE),
+	.pfn		= __phys_to_pfn(PICOXCELL_PERIPH_BASE),
+	.length		= PICOXCELL_PERIPH_LENGTH,
+	.type		= MT_DEVICE,
+};
+
+static void __init picoxcell_map_io(void)
+{
+	iotable_init(&io_map, 1);
+}
+
 static void __init picoxcell_init_machine(void)
 {
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
diff --git a/trunk/arch/arm/mach-picoxcell/common.h b/trunk/arch/arm/mach-picoxcell/common.h
index 5263f0fa095c..83d55ab956a4 100644
--- a/trunk/arch/arm/mach-picoxcell/common.h
+++ b/trunk/arch/arm/mach-picoxcell/common.h
@@ -13,6 +13,5 @@
 #include <asm/mach/time.h>
 
 extern struct sys_timer picoxcell_timer;
-extern void picoxcell_map_io(void);
 
 #endif /* __PICOXCELL_COMMON_H__ */
diff --git a/trunk/arch/arm/mach-picoxcell/io.c b/trunk/arch/arm/mach-picoxcell/io.c
deleted file mode 100644
index 39e9b9e8cc37..000000000000
--- a/trunk/arch/arm/mach-picoxcell/io.c
+++ /dev/null
@@ -1,32 +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 version 2 as
- * published by the Free Software Foundation.
- *
- * All enquiries to support@picochip.com
- */
-#include <linux/io.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/of.h>
-
-#include <asm/mach/map.h>
-
-#include <mach/map.h>
-#include <mach/picoxcell_soc.h>
-
-#include "common.h"
-
-void __init picoxcell_map_io(void)
-{
-	struct map_desc io_map = {
-		.virtual	= PHYS_TO_IO(PICOXCELL_PERIPH_BASE),
-		.pfn		= __phys_to_pfn(PICOXCELL_PERIPH_BASE),
-		.length		= PICOXCELL_PERIPH_LENGTH,
-		.type		= MT_DEVICE,
-	};
-
-	iotable_init(&io_map, 1);
-}