The patch titled
drivers/video/s1d13xxxfb.c: fix build as module with dbg
has been added to the -mm tree. Its filename is
drivers-video-s1d13xxxfbc-as-module-with-dbg.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: drivers/video/s1d13xxxfb.c: fix build as module with dbg
From: Stanislav Brabec <utx@xxxxxxxxxx>
Attached patch fixes two compilation problems of s1d13xxxfb.c:
- Fixes outdated dbg() message to fix compilation error with debugging enabled.
- Do not read kernel command line options when compiled as module.
Signed-off-by: Stanislav Brabec <utx@xxxxxxxxxx>
Cc: "Antonino A. Daplas" <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/s1d13xxxfb.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff -puN drivers/video/s1d13xxxfb.c~drivers-video-s1d13xxxfbc-as-module-with-dbg drivers/video/s1d13xxxfb.c
--- a/drivers/video/s1d13xxxfb.c~drivers-video-s1d13xxxfbc-as-module-with-dbg
+++ a/drivers/video/s1d13xxxfb.c
@@ -540,7 +540,7 @@ s1d13xxxfb_probe(struct platform_device
int ret = 0;
u8 revision;
- dbg("probe called: device is %p\n", dev);
+ dbg("probe called: device is %p\n", pdev);
printk(KERN_INFO "Epson S1D13XXX FB Driver\n");
@@ -753,8 +753,11 @@ static struct platform_driver s1d13xxxfb
static int __init
s1d13xxxfb_init(void)
{
+
+#ifndef MODULE
if (fb_get_options("s1d13xxxfb", NULL))
return -ENODEV;
+#endif
return platform_driver_register(&s1d13xxxfb_driver);
}
_
Patches currently in -mm which might be from utx@xxxxxxxxxx are
drivers-video-s1d13xxxfbc-as-module-with-dbg.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
