diff --git a/[refs] b/[refs]
index e6c4bb0437d2..165f0a3915cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9b8f244b909cdff163b012ff7137337f14b4ab8
+refs/heads/master: e854547bfa55660e088dffa640e7eaac61833c1a
diff --git a/trunk/arch/sh/include/asm/gpio.h b/trunk/arch/sh/include/asm/gpio.h
index 04f53d31489f..7dfe15e2e990 100644
--- a/trunk/arch/sh/include/asm/gpio.h
+++ b/trunk/arch/sh/include/asm/gpio.h
@@ -20,7 +20,7 @@
 #endif
 
 #define ARCH_NR_GPIOS 512
-#include <linux/sh_pfc.h>
+#include <asm-generic/gpio.h>
 
 #ifdef CONFIG_GPIOLIB
 
diff --git a/trunk/arch/sh/include/cpu-common/cpu/pfc.h b/trunk/arch/sh/include/cpu-common/cpu/pfc.h
index 40e864360543..e538813286a8 100644
--- a/trunk/arch/sh/include/cpu-common/cpu/pfc.h
+++ b/trunk/arch/sh/include/cpu-common/cpu/pfc.h
@@ -18,13 +18,9 @@
 
 #include <linux/types.h>
 
-struct pinmux_info;
 struct resource;
 
 int sh_pfc_register(const char *name,
 		    struct resource *resource, u32 num_resources);
-int sh_pfc_register_info(const char *name,
-			 struct resource *resource, u32 num_resources,
-			 struct pinmux_info *pdata);
 
 #endif /* __ARCH_SH_CPU_PFC_H__ */
diff --git a/trunk/arch/sh/kernel/cpu/pfc.c b/trunk/arch/sh/kernel/cpu/pfc.c
index d045d75c05be..d766564ef7c2 100644
--- a/trunk/arch/sh/kernel/cpu/pfc.c
+++ b/trunk/arch/sh/kernel/cpu/pfc.c
@@ -19,26 +19,15 @@
 #include <cpu/pfc.h>
 
 static struct platform_device sh_pfc_device = {
-	.name		= "sh-pfc",
 	.id		= -1,
 };
 
 int __init sh_pfc_register(const char *name,
 			   struct resource *resource, u32 num_resources)
 {
-	if (name)
-		sh_pfc_device.name = name;
+	sh_pfc_device.name = name;
 	sh_pfc_device.num_resources = num_resources;
 	sh_pfc_device.resource = resource;
 
 	return platform_device_register(&sh_pfc_device);
 }
-
-int __init sh_pfc_register_info(const char *name,
-				struct resource *resource, u32 num_resources,
-				struct pinmux_info *pdata)
-{
-	sh_pfc_device.dev.platform_data = pdata;
-
-	return sh_pfc_register(name, resource, num_resources);
-}