diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-07-23 15:19:00 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-07-23 15:19:00 +0200 |
| commit | 9063974cdbc5463528cb6aa60c91bc0267af7bbb (patch) | |
| tree | 1dffc62d8b79b3d89459cf23aa59c553e186840a /drivers/video/atafb.c | |
| parent | d6d6a86e14a6b5a26c785b45268874a8f7a52b4d (diff) | |
| parent | c010b2f76c3032e48097a6eef291d8593d5d79a6 (diff) | |
| download | kernel-crypto-9063974cdbc5463528cb6aa60c91bc0267af7bbb.tar.gz kernel-crypto-9063974cdbc5463528cb6aa60c91bc0267af7bbb.tar.xz kernel-crypto-9063974cdbc5463528cb6aa60c91bc0267af7bbb.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/atafb.c')
| -rw-r--r-- | drivers/video/atafb.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index dff35474b85..fa55d356b53 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c @@ -3110,7 +3110,7 @@ int __init atafb_init(void) printk("atafb_init: start\n"); if (!MACH_IS_ATARI) - return -ENXIO; + return -ENODEV; do { #ifdef ATAFB_EXT @@ -3230,6 +3230,9 @@ int __init atafb_init(void) return -EINVAL; } + fb_videomode_to_modelist(atafb_modedb, NUM_TOTAL_MODES, + &fb_info.modelist); + atafb_set_disp(&fb_info); fb_alloc_cmap(&(fb_info.cmap), 1 << fb_info.var.bits_per_pixel, 0); |