diff --git a/[refs] b/[refs]
index 0b8c09e3a8b0..074ebb67a487 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66ad6a613abeeeabc5217a0498fae63205e8ddb8
+refs/heads/master: 208d038f4792b5ca0dc76deebbc0ae13b4f1a744
diff --git a/trunk/drivers/pwm/pwm-imx.c b/trunk/drivers/pwm/pwm-imx.c
index 13d4d22f12cf..a1e799ee07de 100644
--- a/trunk/drivers/pwm/pwm-imx.c
+++ b/trunk/drivers/pwm/pwm-imx.c
@@ -271,17 +271,7 @@ static struct platform_driver imx_pwm_driver = {
 	.remove		= __devexit_p(imx_pwm_remove),
 };
 
-static int __init imx_pwm_init(void)
-{
-	return platform_driver_register(&imx_pwm_driver);
-}
-arch_initcall(imx_pwm_init);
-
-static void __exit imx_pwm_exit(void)
-{
-	platform_driver_unregister(&imx_pwm_driver);
-}
-module_exit(imx_pwm_exit);
+module_platform_driver(imx_pwm_driver);
 
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");