diff --git a/[refs] b/[refs] index 3389ab050a58..3b8b58f8c9df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfe96ddcfa22b44100814b9435770f6ff1309d37 +refs/heads/master: 8e44770f093c003d11784060fea4ffc82ad576eb diff --git a/trunk/drivers/gpu/drm/omapdrm/omap_fbdev.c b/trunk/drivers/gpu/drm/omapdrm/omap_fbdev.c index 11eed30efe06..f0033bd3e4ae 100644 --- a/trunk/drivers/gpu/drm/omapdrm/omap_fbdev.c +++ b/trunk/drivers/gpu/drm/omapdrm/omap_fbdev.c @@ -131,9 +131,6 @@ static struct fb_ops omap_fb_ops = { .fb_pan_display = omap_fbdev_pan_display, .fb_blank = drm_fb_helper_blank, .fb_setcmap = drm_fb_helper_setcmap, - - .fb_debug_enter = drm_fb_helper_debug_enter, - .fb_debug_leave = drm_fb_helper_debug_leave, }; static int omap_fbdev_create(struct drm_fb_helper *helper,