From: Chandra Konduru <chandra.konduru@intel.com>
Date: Wed, 10 Jun 2015 23:16:12 +0000 (-0700)
Subject: drm/i915: Delete duplicate #defines added for DCx
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7cd35277b4b7af2121dbc5534fc112e2b3896ef4;p=openwrt%2Fstaging%2Fblogic.git

drm/i915: Delete duplicate #defines added for DCx

Delete the duplicate #defines introduced by:

	commit 6b457d31ea0465fcadcf6d5044f5f71398954727
	Author: A.Sunil Kamath <sunil.kamath@intel.com>
	Date:   Thu Apr 16 14:22:09 2015 +0530

		drm/i915/skl: Implement enable/disable for Display C5 state.

Signed-off-by: Chandra Konduru <chandra.konduru@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index c9f9d3d3adba..a66967fd0197 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -7282,12 +7282,6 @@ enum skl_disp_power_wells {
 #define DC_STATE_EN			0x45504
 #define  DC_STATE_EN_UPTO_DC5		(1<<0)
 #define  DC_STATE_EN_DC9		(1<<3)
-
-/*
-* SKL DC
-*/
-#define  DC_STATE_EN			0x45504
-#define  DC_STATE_EN_UPTO_DC5		(1<<0)
 #define  DC_STATE_EN_UPTO_DC6		(2<<0)
 #define  DC_STATE_EN_UPTO_DC5_DC6_MASK   0x3