From f6e594bb9df16ae784b319a321458da7d5ad6549 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 14 Nov 2007 16:58:55 -0800 Subject: [PATCH] --- yaml --- r: 73675 b: refs/heads/master c: 28822f22e18fc3c422f64b5bf0bb1e6c306af634 h: refs/heads/master i: 73673: e79da1380b1f675aba2bbb5d6e29a50b1d908b38 73671: 07ec99758dd149d4194d6d71faa408d9ad81881b v: v3 --- [refs] | 2 +- trunk/drivers/video/s1d13xxxfb.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 98f0a6304341..aec73275ffe6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfe36bde59bc1ae868e775ad82386c3acaabb738 +refs/heads/master: 28822f22e18fc3c422f64b5bf0bb1e6c306af634 diff --git a/trunk/drivers/video/s1d13xxxfb.c b/trunk/drivers/video/s1d13xxxfb.c index a5333c190789..b829dc7c5edf 100644 --- a/trunk/drivers/video/s1d13xxxfb.c +++ b/trunk/drivers/video/s1d13xxxfb.c @@ -540,7 +540,7 @@ s1d13xxxfb_probe(struct platform_device *pdev) 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_driver = { static int __init s1d13xxxfb_init(void) { + +#ifndef MODULE if (fb_get_options("s1d13xxxfb", NULL)) return -ENODEV; +#endif return platform_driver_register(&s1d13xxxfb_driver); }