From bb8a0e9f69577058d95904a486e8dba4eb1a86ad Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Tue, 17 Apr 2012 14:19:11 +1000
Subject: [PATCH] --- yaml --- r: 302663 b: refs/heads/master c:
 6621c5cde9c308ce3b08d5954bb8443d853d9888 h: refs/heads/master i:   302661:
 24204d3e36b468d29284c4e07c734b64a13798f9   302659:
 0dc08f2ce9762cb997a97a45744a14d98e6f4610   302655:
 c25874a94030bd56e084d419d54b71fcf3ba30d5 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/m68k/platform/5272/Makefile |  2 +-
 trunk/arch/m68k/platform/5272/config.c | 11 ++++++++++
 trunk/arch/m68k/platform/5272/gpio.c   | 29 --------------------------
 4 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 trunk/arch/m68k/platform/5272/gpio.c

diff --git a/[refs] b/[refs]
index d6275339cd57..e0d68732d914 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60e26cfd0bd4c1ee682c8c50378e650823ce6d2f
+refs/heads/master: 6621c5cde9c308ce3b08d5954bb8443d853d9888
diff --git a/trunk/arch/m68k/platform/5272/Makefile b/trunk/arch/m68k/platform/5272/Makefile
index 34110fc14301..932ddabdfe8a 100644
--- a/trunk/arch/m68k/platform/5272/Makefile
+++ b/trunk/arch/m68k/platform/5272/Makefile
@@ -14,5 +14,5 @@
 
 asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
 
-obj-y := config.o gpio.o intc.o
+obj-y := config.o intc.o
 
diff --git a/trunk/arch/m68k/platform/5272/config.c b/trunk/arch/m68k/platform/5272/config.c
index e68bc7a148eb..43e36060da18 100644
--- a/trunk/arch/m68k/platform/5272/config.c
+++ b/trunk/arch/m68k/platform/5272/config.c
@@ -19,6 +19,7 @@
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
 #include <asm/mcfuart.h>
+#include <asm/mcfgpio.h>
 
 /***************************************************************************/
 
@@ -30,6 +31,16 @@ unsigned char ledbank = 0xff;
 
 /***************************************************************************/
 
+struct mcf_gpio_chip mcf_gpio_chips[] = {
+	MCFGPS(PA,  0, 16, MCFSIM_PADDR, MCFSIM_PADAT, MCFSIM_PADAT),
+	MCFGPS(PB, 16, 16, MCFSIM_PBDDR, MCFSIM_PBDAT, MCFSIM_PBDAT),
+	MCFGPS(Pc, 32, 16, MCFSIM_PCDDR, MCFSIM_PCDAT, MCFSIM_PCDAT),
+};
+
+unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);
+
+/***************************************************************************/
+
 static void __init m5272_uarts_init(void)
 {
 	u32 v;
diff --git a/trunk/arch/m68k/platform/5272/gpio.c b/trunk/arch/m68k/platform/5272/gpio.c
deleted file mode 100644
index c029dab7baf3..000000000000
--- a/trunk/arch/m68k/platform/5272/gpio.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Coldfire generic GPIO support
- *
- * (C) Copyright 2009, Steven King <sfking@fdwdc.com>
- *
- * 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; version 2 of the License.
- *
- * 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.
-*/
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-
-#include <asm/coldfire.h>
-#include <asm/mcfsim.h>
-#include <asm/mcfgpio.h>
-
-struct mcf_gpio_chip mcf_gpio_chips[] = {
-	MCFGPS(PA,  0, 16, MCFSIM_PADDR, MCFSIM_PADAT, MCFSIM_PADAT),
-	MCFGPS(PB, 16, 16, MCFSIM_PBDDR, MCFSIM_PBDAT, MCFSIM_PBDAT),
-	MCFGPS(Pc, 32, 16, MCFSIM_PCDDR, MCFSIM_PCDAT, MCFSIM_PCDAT),
-};
-
-unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);