From 39bd61685e288a17c8a31871c246c765027d0231 Mon Sep 17 00:00:00 2001
From: Joonyoung Shim <jy0922.shim@samsung.com>
Date: Thu, 5 Apr 2012 20:49:23 +0900
Subject: [PATCH] --- yaml --- r: 299005 b: refs/heads/master c:
 46da222be7873bd1c79fa110d6988a2b826f7dee h: refs/heads/master i:   299003:
 10a7e81a4acc1cc80e79c270dbcd8304a35581ec v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/gpu/drm/exynos/exynos_hdmi.c  | 1 -
 trunk/drivers/gpu/drm/exynos/exynos_mixer.c | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 72588e840021..eaaf53e272d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9309d1bf220122659328040db47eede32514656
+refs/heads/master: 46da222be7873bd1c79fa110d6988a2b826f7dee
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_hdmi.c b/trunk/drivers/gpu/drm/exynos/exynos_hdmi.c
index 0a713174535e..340424f27fe4 100644
--- a/trunk/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/trunk/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -40,7 +40,6 @@
 
 #include "exynos_hdmi.h"
 
-#define HDMI_OVERLAY_NUMBER	3
 #define MAX_WIDTH		1920
 #define MAX_HEIGHT		1080
 #define get_hdmi_context(dev)	platform_get_drvdata(to_platform_device(dev))
diff --git a/trunk/drivers/gpu/drm/exynos/exynos_mixer.c b/trunk/drivers/gpu/drm/exynos/exynos_mixer.c
index 495a7afea962..baad0dde1ac5 100644
--- a/trunk/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/trunk/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -75,13 +75,10 @@ struct mixer_resources {
 };
 
 struct mixer_context {
-	struct fb_videomode	*default_timing;
 	unsigned int		default_win;
-	unsigned int		default_bpp;
 	unsigned int		irq;
 	int			pipe;
 	bool			interlace;
-	bool			vp_enabled;
 
 	struct mixer_resources	mixer_res;
 	struct hdmi_win_data	win_data[HDMI_OVERLAY_NUMBER];