diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-27 00:04:59 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-27 00:04:59 +0200 |
| commit | d9ecdb282c91952796b7542c4f57fd6de6948d7b (patch) | |
| tree | fd4de7923968afa7d2981fb037e2255fc2cfa1e1 /drivers/video/stifb.c | |
| parent | [ARM] fix nwflash.c: 6ee8928d94841aa764aeaf645ad16daff811dc26 (diff) | |
| parent | [ARM] update defconfig for eseries. (diff) | |
| download | linux-d9ecdb282c91952796b7542c4f57fd6de6948d7b.tar.xz linux-d9ecdb282c91952796b7542c4f57fd6de6948d7b.zip | |
Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
Diffstat (limited to 'drivers/video/stifb.c')
| -rw-r--r-- | drivers/video/stifb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c index 598d35eff935..166481402412 100644 --- a/drivers/video/stifb.c +++ b/drivers/video/stifb.c @@ -1078,8 +1078,7 @@ static struct fb_ops stifb_ops = { * Initialization */ -int __init -stifb_init_fb(struct sti_struct *sti, int bpp_pref) +static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) { struct fb_fix_screeninfo *fix; struct fb_var_screeninfo *var; @@ -1315,8 +1314,7 @@ static int stifb_disabled __initdata; int __init stifb_setup(char *options); -int __init -stifb_init(void) +static int __init stifb_init(void) { struct sti_struct *sti; struct sti_struct *def_sti; |