diff --git a/[refs] b/[refs]
index e04d31bb7976..bf9d729538b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c18df85d731196f40784492d36d0baefdedf15a
+refs/heads/master: 7f000dd4542fcc1a69b429c0af6c6d961d7fb912
diff --git a/trunk/drivers/video/omap/lcd_htcherald.c b/trunk/drivers/video/omap/lcd_htcherald.c
index a9007c5d1fad..4802419da83b 100644
--- a/trunk/drivers/video/omap/lcd_htcherald.c
+++ b/trunk/drivers/video/omap/lcd_htcherald.c
@@ -115,12 +115,12 @@ struct platform_driver htcherald_panel_driver = {
 	},
 };
 
-static int htcherald_panel_drv_init(void)
+static int __init htcherald_panel_drv_init(void)
 {
 	return platform_driver_register(&htcherald_panel_driver);
 }
 
-static void htcherald_panel_drv_cleanup(void)
+static void __exit htcherald_panel_drv_cleanup(void)
 {
 	platform_driver_unregister(&htcherald_panel_driver);
 }