---

yaml --- r: 299005 b: refs/heads/master c: 46da222 h: refs/heads/master i: 299003: 10a7e81 v: v3
git-mirror · Apr 12, 2012 · 39bd616 · 39bd616
1 parent 1dc1dba
commit 39bd616
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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
@@ -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];