Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12

1 files changed, 16 insertions, 3 deletions

diff --git a/drivers/video/broadsheetfb.c b/drivers/video/broadsheetfb.c
index 8556264..b09701c 100644
--- a/drivers/video/broadsheetfb.c
+++ b/drivers/video/broadsheetfb.c
@@ -1167,8 +1167,9 @@ static int broadsheetfb_probe(struct platform_device *dev)
 	if (retval < 0)
 		goto err_unreg_fb;
 
-	fb_info(info, "Broadsheet frame buffer, using %dK of video memory\n",
-		videomemorysize >> 10);
+	printk(KERN_INFO
+	       "fb%d: Broadsheet frame buffer, using %dK of video memory\n",
+	       info->node, videomemorysize >> 10);
 
 
 	return 0;
@@ -1216,7 +1217,19 @@ static struct platform_driver broadsheetfb_driver = {
 		.name	= "broadsheetfb",
 	},
 };
-module_platform_driver(broadsheetfb_driver);
+
+static int __init broadsheetfb_init(void)
+{
+	return platform_driver_register(&broadsheetfb_driver);
+}
+
+static void __exit broadsheetfb_exit(void)
+{
+	platform_driver_unregister(&broadsheetfb_driver);
+}
+
+module_init(broadsheetfb_init);
+module_exit(broadsheetfb_exit);
 
 MODULE_DESCRIPTION("fbdev driver for Broadsheet controller");
 MODULE_AUTHOR("Jaya Kumar");