From 0dc08f2ce9762cb997a97a45744a14d98e6f4610 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Tue, 17 Apr 2012 13:57:04 +1000
Subject: [PATCH] --- yaml --- r: 302659 b: refs/heads/master c:
 a75250b3d5c5e5f76620962b45e971370f1b8ad8 h: refs/heads/master i:   302657:
 7ef2a8121cb323495d42488144b3cc4150a3b95d   302655:
 c25874a94030bd56e084d419d54b71fcf3ba30d5 v: v3

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

diff --git a/[refs] b/[refs]
index f4c62e463c8a..5f2f0c885154 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f23c144d4265b9251a4146e057af668bcd7667cb
+refs/heads/master: a75250b3d5c5e5f76620962b45e971370f1b8ad8
diff --git a/trunk/arch/m68k/platform/5206/Makefile b/trunk/arch/m68k/platform/5206/Makefile
index b5db05625cfa..8a34a9d443e4 100644
--- a/trunk/arch/m68k/platform/5206/Makefile
+++ b/trunk/arch/m68k/platform/5206/Makefile
@@ -14,5 +14,5 @@
 
 asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
 
-obj-y := config.o gpio.o
+obj-y := config.o
 
diff --git a/trunk/arch/m68k/platform/5206/config.c b/trunk/arch/m68k/platform/5206/config.c
index 6bfbeebd231b..a8b81df653f0 100644
--- a/trunk/arch/m68k/platform/5206/config.c
+++ b/trunk/arch/m68k/platform/5206/config.c
@@ -16,6 +16,15 @@
 #include <asm/machdep.h>
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
+#include <asm/mcfgpio.h>
+
+/***************************************************************************/
+
+struct mcf_gpio_chip mcf_gpio_chips[] = {
+	MCFGPS(PP, 0, 8, MCFSIM_PADDR, MCFSIM_PADAT, MCFSIM_PADAT),
+};
+
+unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);
 
 /***************************************************************************/
 
diff --git a/trunk/arch/m68k/platform/5206/gpio.c b/trunk/arch/m68k/platform/5206/gpio.c
deleted file mode 100644
index a652f8e550c6..000000000000
--- a/trunk/arch/m68k/platform/5206/gpio.c
+++ /dev/null
@@ -1,27 +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(PP, 0, 8, MCFSIM_PADDR, MCFSIM_PADAT, MCFSIM_PADAT),
-};
-
-unsigned int mcf_gpio_chips_size = ARRAY_SIZE(mcf_gpio_chips);