diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
| commit | c0e4077c946104e5d8a62f835dcdca5c79c8af7d (patch) | |
| tree | c1f458722f86690a6172bbac2dfef3241ba0ec7e /drivers/video/modedb.c | |
| parent | 94c2d01a537daf51a9fcf229d7d2204c979355d9 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/video/modedb.c')
| -rw-r--r-- | drivers/video/modedb.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c index 1da2f84bdc2..26a1c618a20 100644 --- a/drivers/video/modedb.c +++ b/drivers/video/modedb.c @@ -183,6 +183,10 @@ static const struct fb_videomode modedb[] = { NULL, 75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3, FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED }, { + /* 1680x1050 @ 60 Hz, 65.191 kHz hsync */ + NULL, 60, 1680, 1050, 6848, 280, 104, 30, 3, 176, 6, + FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED + }, { /* 1600x1200 @ 85 Hz, 105.77 kHz hsync */ NULL, 85, 1600, 1200, 4545, 272, 16, 37, 4, 192, 3, FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED @@ -496,7 +500,7 @@ int fb_find_mode(struct fb_var_screeninfo *var, /* Set up defaults */ if (!db) { db = modedb; - dbsize = sizeof(modedb)/sizeof(*modedb); + dbsize = ARRAY_SIZE(modedb); } if (!default_mode) default_mode = &modedb[DEFAULT_MODEDB_INDEX]; |