git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core...
[sfrench/cifs-2.6.git]
/
drivers
/
video
/
amifb.c
diff --git
a/drivers/video/amifb.c
b/drivers/video/amifb.c
index 05a328c11a8bf17b7bd6178841caf546644c1639..45c154ade9ca4901710716356f02abdcd336929c 100644
(file)
--- a/
drivers/video/amifb.c
+++ b/
drivers/video/amifb.c
@@
-2383,6
+2383,9
@@
default_chipset:
goto amifb_error;
}
+ fb_videomode_to_modelist(ami_modedb, NUM_TOTAL_MODES,
+ &fb_info.modelist);
+
round_down_bpp = 0;
chipptr = chipalloc(fb_info.fix.smem_len+
SPRITEMEMSIZE+