diff --git a/[refs] b/[refs] index dd886771b156..10a39246cf27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55654be9e11461484141d8dff0715efa0d7a945a +refs/heads/master: 6fb488239cd8750cc818197d6c346409c0e8d330 diff --git a/trunk/drivers/video/tridentfb.c b/trunk/drivers/video/tridentfb.c index bd54cd0de39a..982eeee0ae98 100644 --- a/trunk/drivers/video/tridentfb.c +++ b/trunk/drivers/video/tridentfb.c @@ -905,7 +905,6 @@ static int tridentfb_set_par(struct fb_info *info) vblankstart = var->yres; vblankend = vtotal + 2; - enable_mmio(); crtc_unlock(); write3CE(CyberControl, 8);