diff --git a/[refs] b/[refs] index 9624258f7955..f9750588feab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d83b0bb8e5efda28ce4a1abc78277f1d03e50e5 +refs/heads/master: 1dfcdfae5783fc10d7f8fcc336de838a44e7636c diff --git a/trunk/drivers/video/modedb.c b/trunk/drivers/video/modedb.c index 1789a52d776a..1da2f84bdc25 100644 --- a/trunk/drivers/video/modedb.c +++ b/trunk/drivers/video/modedb.c @@ -251,6 +251,10 @@ static const struct fb_videomode modedb[] = { NULL, 60, 1920, 1200, 5177, 128, 336, 1, 38, 208, 3, 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 }, };