Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 54971
b: refs/heads/master
c: 19c1a8b
h: refs/heads/master
i:
  54969: 5edc252
  54967: 60ce215
v: v3
  • Loading branch information
Krzysztof Helt authored and Linus Torvalds committed May 8, 2007
1 parent f74280a commit 84b6e6b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4560daaf07ab68bef5e70355d1565b2e0a1a3bcf
refs/heads/master: 19c1a8b3122e7b2007cfd2836da2318816f324cc
6 changes: 4 additions & 2 deletions trunk/drivers/video/skeletonfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
{
/*
Expand Down

0 comments on commit 84b6e6b

Please sign in to comment.