Commit 28822f22e18fc3c422f64b5bf0bb1e6c306af634
Committed by
Linus Torvalds
Linus Torvalds
1 parent
cfe36bde59
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>
Showing 1 changed file with 4 additions and 1 deletions Side-by-side Diff
drivers/video/s1d13xxxfb.c
| ... | ... | @@ -540,7 +540,7 @@ |
| 540 | 540 | int ret = 0; |
| 541 | 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 | 545 | printk(KERN_INFO "Epson S1D13XXX FB Driver\n"); |
| 546 | 546 | |
| 547 | 547 | |
| ... | ... | @@ -753,8 +753,11 @@ |
| 753 | 753 | static int __init |
| 754 | 754 | s1d13xxxfb_init(void) |
| 755 | 755 | { |
| 756 | + | |
| 757 | +#ifndef MODULE | |
| 756 | 758 | if (fb_get_options("s1d13xxxfb", NULL)) |
| 757 | 759 | return -ENODEV; |
| 760 | +#endif | |
| 758 | 761 | |
| 759 | 762 | return platform_driver_register(&s1d13xxxfb_driver); |
| 760 | 763 | } |