git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[pandora-kernel.git]
/
drivers
/
video
/
omap2
/
dss
/
dispc.c
diff --git
a/drivers/video/omap2/dss/dispc.c
b/drivers/video/omap2/dss/dispc.c
index
f51646f
..
bbeb8dd
100644
(file)
--- a/
drivers/video/omap2/dss/dispc.c
+++ b/
drivers/video/omap2/dss/dispc.c
@@
-3726,7
+3726,6
@@
static int __init omap_dispchw_probe(struct platform_device *pdev)
}
pm_runtime_enable(&pdev->dev);
- pm_runtime_irq_safe(&pdev->dev);
r = dispc_runtime_get();
if (r)