diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-26 09:01:22 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-26 09:01:22 +1000 |
| commit | 9948d378b99b06f6f34164dd8ff827e228ae9251 (patch) | |
| tree | 35de4877d4745bb9f219178f33629980168ba74d /drivers/video/console | |
| parent | fd3830b379b87b9a47d796d79d1e41f73e1973fa (diff) | |
| parent | 45f1798484748894c348a76fcf0b9ec43d891795 (diff) | |
| download | linux-9948d378b99b06f6f34164dd8ff827e228ae9251.tar.gz linux-9948d378b99b06f6f34164dd8ff827e228ae9251.tar.bz2 linux-9948d378b99b06f6f34164dd8ff827e228ae9251.zip | |
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
mailmap: Add an entry for Axel Lin.
video: fix some comments in drivers/video/console/vgacon.c
drivers/video/bf537-lq035.c: Add missing IS_ERR test
video: pxa168fb: remove a redundant pxa168fb_check_var call
video: da8xx-fb: fix fb_probe error path
video: pxa3xx-gcu: Return -EFAULT when copy_from_user() fails
video: nuc900fb: properly free resources in nuc900fb_remove
video: nuc900fb: fix compile error
Diffstat (limited to 'drivers/video/console')
| -rw-r--r-- | drivers/video/console/vgacon.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index c97491b8b39b..915fd74da7a2 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c @@ -202,11 +202,7 @@ static void vgacon_scrollback_init(int pitch) } } -/* - * Called only duing init so call of alloc_bootmen is ok. - * Marked __init_refok to silence modpost. - */ -static void __init_refok vgacon_scrollback_startup(void) +static void vgacon_scrollback_startup(void) { vgacon_scrollback = kcalloc(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE, 1024, GFP_NOWAIT); vgacon_scrollback_init(vga_video_num_columns * 2); |