summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/omapdrm/dss/hdmi5.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-06-14 11:04:13 +0200
committerIngo Molnar <mingo@kernel.org>2016-06-14 11:04:13 +0200
commit07f9f22087a94e8162f77ee997c52a23f158aee8 (patch)
tree04bfe0395c6aa95bae5c6983c3433d9ac8eb7731 /drivers/gpu/drm/omapdrm/dss/hdmi5.c
parent03c041c5bf6ed584dff36b7cd509e0146a124277 (diff)
parentb7fa30c9cc48c4f55663420472505d3b4f6e1705 (diff)
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/hdmi5.c')
-rw-r--r--drivers/gpu/drm/omapdrm/dss/hdmi5.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index e129245eb8a9..9255c0e1e4a7 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -120,7 +120,6 @@ static irqreturn_t hdmi_irq_handler(int irq, void *data)
static int hdmi_init_regulator(void)
{
- int r;
struct regulator *reg;
if (hdmi.vdda_reg != NULL)