Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 198340
b: refs/heads/master
c: fb6cb32
h: refs/heads/master
v: v3
  • Loading branch information
Henrik Kretzschmar authored and Linus Torvalds committed May 25, 2010
1 parent a77702a commit c7319c3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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: ad1458464cbbe6935be6e20d70920301733158af
refs/heads/master: fb6cb3270af8f2ad3dd556906a9c52aa85754849
10 changes: 5 additions & 5 deletions trunk/drivers/video/w100fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ static void w100_update_enable(void);
static void w100_update_disable(void);
static void calc_hsync(struct w100fb_par *par);
static void w100_init_graphic_engine(struct w100fb_par *par);
struct w100_pll_info *w100_get_xtal_table(unsigned int freq);
struct w100_pll_info *w100_get_xtal_table(unsigned int freq) __devinit;

/* Pseudo palette size */
#define MAX_PALETTES 16
Expand Down Expand Up @@ -782,7 +782,7 @@ int __devinit w100fb_probe(struct platform_device *pdev)
}


static int w100fb_remove(struct platform_device *pdev)
static int __devexit w100fb_remove(struct platform_device *pdev)
{
struct fb_info *info = platform_get_drvdata(pdev);
struct w100fb_par *par=info->par;
Expand Down Expand Up @@ -1020,7 +1020,7 @@ static struct pll_entries {
{ 0 },
};

struct w100_pll_info *w100_get_xtal_table(unsigned int freq)
struct w100_pll_info __devinit *w100_get_xtal_table(unsigned int freq)
{
struct pll_entries *pll_entry = w100_pll_tables;

Expand Down Expand Up @@ -1611,15 +1611,15 @@ static void w100_vsync(void)

static struct platform_driver w100fb_driver = {
.probe = w100fb_probe,
.remove = w100fb_remove,
.remove = __devexit_p(w100fb_remove),
.suspend = w100fb_suspend,
.resume = w100fb_resume,
.driver = {
.name = "w100fb",
},
};

int __devinit w100fb_init(void)
int __init w100fb_init(void)
{
return platform_driver_register(&w100fb_driver);
}
Expand Down

0 comments on commit c7319c3

Please sign in to comment.