diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-23 11:31:34 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-23 11:31:34 +0400 |
| commit | e152f18027552eb34006b35347e72bc805783027 (patch) | |
| tree | ac9765e68597c08c24de447f46bb3e04d9881e1b /drivers/video/cobalt_lcdfb.c | |
| parent | 49ba4f94bddb7f5272c4596d505f94355cc3fbd2 (diff) | |
| parent | 42c364ace52ae6b4699105b39f2559c256b6cd4c (diff) | |
| download | linux-e152f18027552eb34006b35347e72bc805783027.tar.xz | |
Merge branch 'for-linus' into for-next
This is a preliminary merge before the upcoming merge of generic parser
branch.
Diffstat (limited to 'drivers/video/cobalt_lcdfb.c')
| -rw-r--r-- | drivers/video/cobalt_lcdfb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/cobalt_lcdfb.c b/drivers/video/cobalt_lcdfb.c index 01a4ee7cc6b1..a9031498e10c 100644 --- a/drivers/video/cobalt_lcdfb.c +++ b/drivers/video/cobalt_lcdfb.c @@ -167,7 +167,7 @@ static void lcd_clear(struct fb_info *info) lcd_write_control(info, LCD_RESET); } -static struct fb_fix_screeninfo cobalt_lcdfb_fix __devinitdata = { +static struct fb_fix_screeninfo cobalt_lcdfb_fix = { .id = "cobalt-lcd", .type = FB_TYPE_TEXT, .type_aux = FB_AUX_TEXT_MDA, @@ -331,7 +331,7 @@ static struct fb_ops cobalt_lcd_fbops = { .fb_cursor = cobalt_lcdfb_cursor, }; -static int __devinit cobalt_lcdfb_probe(struct platform_device *dev) +static int cobalt_lcdfb_probe(struct platform_device *dev) { struct fb_info *info; struct resource *res; @@ -374,7 +374,7 @@ static int __devinit cobalt_lcdfb_probe(struct platform_device *dev) return 0; } -static int __devexit cobalt_lcdfb_remove(struct platform_device *dev) +static int cobalt_lcdfb_remove(struct platform_device *dev) { struct fb_info *info; @@ -389,7 +389,7 @@ static int __devexit cobalt_lcdfb_remove(struct platform_device *dev) static struct platform_driver cobalt_lcdfb_driver = { .probe = cobalt_lcdfb_probe, - .remove = __devexit_p(cobalt_lcdfb_remove), + .remove = cobalt_lcdfb_remove, .driver = { .name = "cobalt-lcd", .owner = THIS_MODULE, |