diff options
author | Stanislav Brabec <utx@penguin.cz> | 2007-11-14 19:58:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-14 21:45:38 -0500 |
commit | 28822f22e18fc3c422f64b5bf0bb1e6c306af634 (patch) | |
tree | fb0484c08cc48fcf54e9587ff520fbb66acfc40a | |
parent | cfe36bde59bc1ae868e775ad82386c3acaabb738 (diff) |
drivers/video/s1d13xxxfb.c: fix build as module with dbg
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@penguin.cz>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/video/s1d13xxxfb.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c index a5333c190789..b829dc7c5edf 100644 --- a/drivers/video/s1d13xxxfb.c +++ b/drivers/video/s1d13xxxfb.c | |||
@@ -540,7 +540,7 @@ s1d13xxxfb_probe(struct platform_device *pdev) | |||
540 | int ret = 0; | 540 | int ret = 0; |
541 | u8 revision; | 541 | u8 revision; |
542 | 542 | ||
543 | dbg("probe called: device is %p\n", dev); | 543 | dbg("probe called: device is %p\n", pdev); |
544 | 544 | ||
545 | printk(KERN_INFO "Epson S1D13XXX FB Driver\n"); | 545 | printk(KERN_INFO "Epson S1D13XXX FB Driver\n"); |
546 | 546 | ||
@@ -753,8 +753,11 @@ static struct platform_driver s1d13xxxfb_driver = { | |||
753 | static int __init | 753 | static int __init |
754 | s1d13xxxfb_init(void) | 754 | s1d13xxxfb_init(void) |
755 | { | 755 | { |
756 | |||
757 | #ifndef MODULE | ||
756 | if (fb_get_options("s1d13xxxfb", NULL)) | 758 | if (fb_get_options("s1d13xxxfb", NULL)) |
757 | return -ENODEV; | 759 | return -ENODEV; |
760 | #endif | ||
758 | 761 | ||
759 | return platform_driver_register(&s1d13xxxfb_driver); | 762 | return platform_driver_register(&s1d13xxxfb_driver); |
760 | } | 763 | } |