xserver: Branch 'server-1.4-branch'

[Eric Anholt]

 hw/xfree86/fbdevhw/fbdevhw.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree b328d553723ecf8f893783e91ec00ee6054acb74 (from b69e6165136ff76ba4649bb9d11906fef27b78bc)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Thu Aug 30 21:57:41 2007 +0100

    Allow yres_virtual to be greater for some kernel fbdev drivers.
    
    (temporary fix for older fbdev drivers)
    (cherry picked from commit 87495fc7064d5e0a7575a0713b6895a4172df0fa)

diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index a573b8f..b7eabb2 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -239,7 +239,7 @@ static Bool
 fbdev_modes_equal(struct fb_var_screeninfo *set, struct fb_var_screeninfo *req)
 {
 	return (set->xres_virtual >= req->xres_virtual &&
-		set->yres_virtual == req->yres_virtual &&
+		set->yres_virtual >= req->yres_virtual &&
 		set->bits_per_pixel == req->bits_per_pixel &&
 		set->red.length == req->red.length &&
 		set->green.length == req->green.length &&