diff --git a/[refs] b/[refs]
index a1bf5e7497f3..dc3916daf68a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e347f08aab1bee4187fcda482ebde49090c4844
+refs/heads/master: 8682b3c522c639f3a0de31c86bb91f2f9a6c76cb
diff --git a/trunk/drivers/sh/pfc/core.c b/trunk/drivers/sh/pfc/core.c
index b2e121d927a0..9456c70a2da7 100644
--- a/trunk/drivers/sh/pfc/core.c
+++ b/trunk/drivers/sh/pfc/core.c
@@ -578,18 +578,6 @@ static struct platform_driver sh_pfc_driver = {
 	},
 };
 
-static struct platform_device sh_pfc_device = {
-	.name		= DRV_NAME,
-	.id		= -1,
-};
-
-int __init register_sh_pfc(struct sh_pfc_platform_data *pdata)
-{
-	sh_pfc_device.dev.platform_data = pdata;
-
-	return platform_device_register(&sh_pfc_device);
-}
-
 static int __init sh_pfc_init(void)
 {
 	return platform_driver_register(&sh_pfc_driver);
diff --git a/trunk/include/linux/sh_pfc.h b/trunk/include/linux/sh_pfc.h
index f7f01b231b66..fa1fec084229 100644
--- a/trunk/include/linux/sh_pfc.h
+++ b/trunk/include/linux/sh_pfc.h
@@ -120,16 +120,6 @@ struct sh_pfc_platform_data {
 /* XXX compat for now */
 #define pinmux_info sh_pfc_platform_data
 
-/* drivers/sh/pfc/core.c */
-int register_sh_pfc(struct sh_pfc_platform_data *pfc);
-
-/* xxx */
-static inline int register_pinmux(struct pinmux_info *pip)
-{
-	struct sh_pfc_platform_data *pdata = pip;
-	return register_sh_pfc(pdata);
-}
-
 enum { GPIO_CFG_DRYRUN, GPIO_CFG_REQ, GPIO_CFG_FREE };
 
 /* helper macro for port */