From 5213e0ceb33dce01f9f5936969ffedf1f3676ae9 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Wed, 21 Dec 2011 15:09:54 -0800
Subject: [PATCH] --- yaml --- r: 280084 b: refs/heads/master c:
 a6ec0c03a039677e4b4b5a67a6e19e9e26303000 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/m68k/platform/coldfire/gpio.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ac63980971a4..03793ffcdf37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 269a3eb1bf10a078ede74747a61603693a3f7853
+refs/heads/master: a6ec0c03a039677e4b4b5a67a6e19e9e26303000
diff --git a/trunk/arch/m68k/platform/coldfire/gpio.c b/trunk/arch/m68k/platform/coldfire/gpio.c
index ff0045793450..292a1a5a2d7c 100644
--- a/trunk/arch/m68k/platform/coldfire/gpio.c
+++ b/trunk/arch/m68k/platform/coldfire/gpio.c
@@ -15,7 +15,7 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/sysdev.h>
+#include <linux/device.h>
 
 #include <asm/gpio.h>
 #include <asm/pinmux.h>
@@ -115,13 +115,14 @@ void mcf_gpio_free(struct gpio_chip *chip, unsigned offset)
 		mcf_pinmux_release(mcf_chip->gpio_to_pinmux[offset], 0);
 }
 
-struct sysdev_class mcf_gpio_sysclass = {
-	.name	= "gpio",
+struct bus_type mcf_gpio_subsys = {
+	.name		= "gpio",
+	.dev_name	= "gpio",
 };
 
 static int __init mcf_gpio_sysinit(void)
 {
-	return sysdev_class_register(&mcf_gpio_sysclass);
+	return subsys_system_register(&mcf_gpio_subsys, NULL);
 }
 
 core_initcall(mcf_gpio_sysinit);