git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
video
/
modedb.c
diff --git
a/drivers/video/modedb.c
b/drivers/video/modedb.c
index
d126790
..
244a21a
100644
(file)
--- a/
drivers/video/modedb.c
+++ b/
drivers/video/modedb.c
@@
-12,6
+12,7
@@
*/
#include <linux/module.h>
*/
#include <linux/module.h>
+#include <linux/tty.h>
#include <linux/fb.h>
#include <linux/sched.h>
#include <linux/fb.h>
#include <linux/sched.h>
@@
-258,10
+259,6
@@
static const struct fb_videomode modedb[] = {
/* 1152x768, 60 Hz, PowerBook G4 Titanium I and II */
NULL, 60, 1152, 768, 15386, 158, 26, 29, 3, 136, 6,
FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
/* 1152x768, 60 Hz, PowerBook G4 Titanium I and II */
NULL, 60, 1152, 768, 15386, 158, 26, 29, 3, 136, 6,
FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED
- }, {
- /* 1366x768, 60 Hz, 47.403 kHz hsync, WXGA 16:9 aspect ratio */
- NULL, 60, 1366, 768, 13806, 120, 10, 14, 3, 32, 5,
- 0, FB_VMODE_NONINTERLACED
},
};
},
};
@@
-503,7
+500,7
@@
int fb_find_mode(struct fb_var_screeninfo *var,
/* Set up defaults */
if (!db) {
db = modedb;
/* Set up defaults */
if (!db) {
db = modedb;
- dbsize =
ARRAY_SIZE(
modedb);
+ dbsize =
sizeof(modedb)/sizeof(*
modedb);
}
if (!default_mode)
default_mode = &modedb[DEFAULT_MODEDB_INDEX];
}
if (!default_mode)
default_mode = &modedb[DEFAULT_MODEDB_INDEX];
@@
-790,9
+787,8
@@
struct fb_videomode *fb_find_best_mode(struct fb_var_screeninfo *var,
if (diff > d) {
diff = d;
best = mode;
if (diff > d) {
diff = d;
best = mode;
- } else if (diff == d && best &&
- mode->refresh > best->refresh)
- best = mode;
+ } else if (diff == d && mode->refresh > best->refresh)
+ best = mode;
}
}
return best;
}
}
return best;
@@
-1020,6
+1016,8
@@
EXPORT_SYMBOL(fb_videomode_to_var);
EXPORT_SYMBOL(fb_var_to_videomode);
EXPORT_SYMBOL(fb_mode_is_equal);
EXPORT_SYMBOL(fb_add_videomode);
EXPORT_SYMBOL(fb_var_to_videomode);
EXPORT_SYMBOL(fb_mode_is_equal);
EXPORT_SYMBOL(fb_add_videomode);
+EXPORT_SYMBOL(fb_delete_videomode);
+EXPORT_SYMBOL(fb_destroy_modelist);
EXPORT_SYMBOL(fb_match_mode);
EXPORT_SYMBOL(fb_find_best_mode);
EXPORT_SYMBOL(fb_find_nearest_mode);
EXPORT_SYMBOL(fb_match_mode);
EXPORT_SYMBOL(fb_find_best_mode);
EXPORT_SYMBOL(fb_find_nearest_mode);