diff --git a/[refs] b/[refs]
index c5085ac22c81..0e7d5b9e289d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bd237b8a45eb107d6304496fbd5b4a34471fbd3
+refs/heads/master: 81d75e9f56522ed340d7c72471b35ac8e25d823d
diff --git a/trunk/drivers/media/rc/gpio-ir-recv.c b/trunk/drivers/media/rc/gpio-ir-recv.c
index 15e346e0bcd0..59fe60cd1e02 100644
--- a/trunk/drivers/media/rc/gpio-ir-recv.c
+++ b/trunk/drivers/media/rc/gpio-ir-recv.c
@@ -194,18 +194,7 @@ static struct platform_driver gpio_ir_recv_driver = {
 #endif
 	},
 };
-
-static int __init gpio_ir_recv_init(void)
-{
-	return platform_driver_register(&gpio_ir_recv_driver);
-}
-module_init(gpio_ir_recv_init);
-
-static void __exit gpio_ir_recv_exit(void)
-{
-	platform_driver_unregister(&gpio_ir_recv_driver);
-}
-module_exit(gpio_ir_recv_exit);
+module_platform_driver(gpio_ir_recv_driver);
 
 MODULE_DESCRIPTION("GPIO IR Receiver driver");
 MODULE_LICENSE("GPL v2");