summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2012-10-06 01:01:53 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2012-10-06 01:01:53 +0400
commitd73d61144c772c6d47758cdca0cb6dcba37a15b6 (patch)
treee2a6ad17e38d580b80e66f21bbe013fbcf1ba8ac
parent1ca0235e0f97cc23733a925b608eec979750f895 (diff)
parent5d0ab0d59d7281dfd58f7b8fdfbec2062c69d4c9 (diff)
Merge branch 'tracking-llct-v3.6-misc-fixes' into merge-linux-linaro-core-trackingllct-20121006.0
-rw-r--r--drivers/staging/omapdrm/omap_drv.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c
index 4beab9447ceb..44149eeb97ae 100644
--- a/drivers/staging/omapdrm/omap_drv.c
+++ b/drivers/staging/omapdrm/omap_drv.c
@@ -761,7 +761,6 @@ static struct drm_driver omap_drm_driver = {
.irq_postinstall = dev_irq_postinstall,
.irq_uninstall = dev_irq_uninstall,
.irq_handler = dev_irq_handler,
- .reclaim_buffers = drm_core_reclaim_buffers,
#ifdef CONFIG_DEBUG_FS
.debugfs_init = omap_debugfs_init,
.debugfs_cleanup = omap_debugfs_cleanup,