diff --git a/[refs] b/[refs] index 5ed65f08dd39..6d92b78f46ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80f51c32c4b52e88c192de8471135dbbd158cc13 +refs/heads/master: 89e5d557171c5ce12c6f149633538582fe10ebb0 diff --git a/trunk/drivers/staging/gma500/mdfld_device.c b/trunk/drivers/staging/gma500/mdfld_device.c index 3955448bac89..e66d04a71191 100644 --- a/trunk/drivers/staging/gma500/mdfld_device.c +++ b/trunk/drivers/staging/gma500/mdfld_device.c @@ -589,7 +589,7 @@ static int mdfld_restore_display_registers(struct drm_device *dev, int pipe) PSB_WVDC32(palette_val[i], palette_reg + (i<<2)); if (pipe == 1) return 0; - if (IS_MFLD(dev) && !mdfld_panel_dpi(dev)) + if (!mdfld_panel_dpi(dev)) mdfld_enable_te(dev, pipe); return 0; }