diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-04 02:35:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-04 02:35:56 -0400 |
| commit | 15c42e5a1f0bccb69508059b8ae0720840068b8e (patch) | |
| tree | 921b088cc7acb50bb8b65dbc30451a8a3958ec8d /drivers/video/modedb.c | |
| parent | 541e316aed6f7d6efeb427a88645c2a8f61418d6 (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
Merge HEAD from rsync://rsync.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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c index fbf659b6dab0..3edc9f49344b 100644 --- a/drivers/video/modedb.c +++ b/drivers/video/modedb.c | |||
| @@ -246,6 +246,11 @@ static const struct fb_videomode modedb[] = { | |||
| 246 | /* 480x300 @ 72 Hz, 48.0 kHz hsync */ | 246 | /* 480x300 @ 72 Hz, 48.0 kHz hsync */ |
| 247 | NULL, 72, 480, 300, 33386, 40, 24, 11, 19, 80, 3, | 247 | NULL, 72, 480, 300, 33386, 40, 24, 11, 19, 80, 3, |
| 248 | 0, FB_VMODE_DOUBLE | 248 | 0, FB_VMODE_DOUBLE |
| 249 | }, { | ||
| 250 | /* 1920x1200 @ 60 Hz, 74.5 Khz hsync */ | ||
| 251 | NULL, 60, 1920, 1200, 5177, 128, 336, 1, 38, 208, 3, | ||
| 252 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, | ||
| 253 | FB_VMODE_NONINTERLACED | ||
| 249 | }, | 254 | }, |
| 250 | }; | 255 | }; |
| 251 | 256 | ||