diff options
Diffstat (limited to 'drivers/video/sm501fb.c')
-rw-r--r-- | drivers/video/sm501fb.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c index 3690effbedcc..1501979099dc 100644 --- a/drivers/video/sm501fb.c +++ b/drivers/video/sm501fb.c | |||
@@ -46,7 +46,7 @@ | |||
46 | static char *fb_mode = "640x480-16@60"; | 46 | static char *fb_mode = "640x480-16@60"; |
47 | static unsigned long default_bpp = 16; | 47 | static unsigned long default_bpp = 16; |
48 | 48 | ||
49 | static struct fb_videomode __devinitdata sm501_default_mode = { | 49 | static struct fb_videomode sm501_default_mode = { |
50 | .refresh = 60, | 50 | .refresh = 60, |
51 | .xres = 640, | 51 | .xres = 640, |
52 | .yres = 480, | 52 | .yres = 480, |
@@ -1664,8 +1664,7 @@ static void sm501fb_stop(struct sm501fb_info *info) | |||
1664 | resource_size(info->regs_res)); | 1664 | resource_size(info->regs_res)); |
1665 | } | 1665 | } |
1666 | 1666 | ||
1667 | static int __devinit sm501fb_init_fb(struct fb_info *fb, | 1667 | static int sm501fb_init_fb(struct fb_info *fb, enum sm501_controller head, |
1668 | enum sm501_controller head, | ||
1669 | const char *fbname) | 1668 | const char *fbname) |
1670 | { | 1669 | { |
1671 | struct sm501_platdata_fbsub *pd; | 1670 | struct sm501_platdata_fbsub *pd; |
@@ -1850,8 +1849,8 @@ static struct sm501_platdata_fb sm501fb_def_pdata = { | |||
1850 | static char driver_name_crt[] = "sm501fb-crt"; | 1849 | static char driver_name_crt[] = "sm501fb-crt"; |
1851 | static char driver_name_pnl[] = "sm501fb-panel"; | 1850 | static char driver_name_pnl[] = "sm501fb-panel"; |
1852 | 1851 | ||
1853 | static int __devinit sm501fb_probe_one(struct sm501fb_info *info, | 1852 | static int sm501fb_probe_one(struct sm501fb_info *info, |
1854 | enum sm501_controller head) | 1853 | enum sm501_controller head) |
1855 | { | 1854 | { |
1856 | unsigned char *name = (head == HEAD_CRT) ? "crt" : "panel"; | 1855 | unsigned char *name = (head == HEAD_CRT) ? "crt" : "panel"; |
1857 | struct sm501_platdata_fbsub *pd; | 1856 | struct sm501_platdata_fbsub *pd; |
@@ -1892,9 +1891,8 @@ static void sm501_free_init_fb(struct sm501fb_info *info, | |||
1892 | fb_dealloc_cmap(&fbi->cmap); | 1891 | fb_dealloc_cmap(&fbi->cmap); |
1893 | } | 1892 | } |
1894 | 1893 | ||
1895 | static int __devinit sm501fb_start_one(struct sm501fb_info *info, | 1894 | static int sm501fb_start_one(struct sm501fb_info *info, |
1896 | enum sm501_controller head, | 1895 | enum sm501_controller head, const char *drvname) |
1897 | const char *drvname) | ||
1898 | { | 1896 | { |
1899 | struct fb_info *fbi = info->fb[head]; | 1897 | struct fb_info *fbi = info->fb[head]; |
1900 | int ret; | 1898 | int ret; |
@@ -1922,7 +1920,7 @@ static int __devinit sm501fb_start_one(struct sm501fb_info *info, | |||
1922 | return 0; | 1920 | return 0; |
1923 | } | 1921 | } |
1924 | 1922 | ||
1925 | static int __devinit sm501fb_probe(struct platform_device *pdev) | 1923 | static int sm501fb_probe(struct platform_device *pdev) |
1926 | { | 1924 | { |
1927 | struct sm501fb_info *info; | 1925 | struct sm501fb_info *info; |
1928 | struct device *dev = &pdev->dev; | 1926 | struct device *dev = &pdev->dev; |