summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2007-05-08 00:40:14 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 11:15:33 -0700
commit19c1a8b3122e7b2007cfd2836da2318816f324cc (patch)
tree65f4587538900d62f921114da04097d541a3304e
parent4560daaf07ab68bef5e70355d1565b2e0a1a3bcf (diff)
downloadlinux-19c1a8b3122e7b2007cfd2836da2318816f324cc.tar.bz2
skeletonfb: improvements
This patch adds a macro to register PCI ids table and corrects type of xxxfb_fix variable to avoid modpost warnings. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/skeletonfb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c
index c15b6fefe919..842b5cd054c6 100644
--- a/drivers/video/skeletonfb.c
+++ b/drivers/video/skeletonfb.c
@@ -84,7 +84,7 @@ struct xxx_par;
* if we don't use modedb. If we do use modedb see xxxfb_init how to use it
* to get a fb_var_screeninfo. Otherwise define a default var as well.
*/
-static struct fb_fix_screeninfo xxxfb_fix __initdata = {
+static struct fb_fix_screeninfo xxxfb_fix __devinitdata = {
.id = "FB's name",
.type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_PSEUDOCOLOR,
@@ -705,7 +705,7 @@ static int __devinit xxxfb_probe(struct pci_dev *dev,
info->screen_base = framebuffer_virtual_memory;
info->fbops = &xxxfb_ops;
info->fix = xxxfb_fix; /* this will be the only time xxxfb_fix will be
- * used, so mark it as __initdata
+ * used, so mark it as __devinitdata
*/
info->pseudo_palette = pseudo_palette; /* The pseudopalette is an
* 16-member array
@@ -900,6 +900,8 @@ static struct pci_driver xxxfb_driver = {
.resume = xxxfb_resume, /* optional but recommended */
};
+MODULE_DEVICE_TABLE(pci, xxxfb_id_table);
+
int __init xxxfb_init(void)
{
/*