From 971c9fd0d9467bb839f99e3d1baec77945339add Mon Sep 17 00:00:00 2001
From: Joel Bodenmann <joel@unormal.org>
Date: Thu, 22 Nov 2012 21:23:38 +0100
Subject: [PATCH] S6D1121 macro fix

---
 drivers/gdisp/S6D1121/gdisp_lld.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/gdisp/S6D1121/gdisp_lld.c b/drivers/gdisp/S6D1121/gdisp_lld.c
index 5f5d385a..585899d2 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld.c
+++ b/drivers/gdisp/S6D1121/gdisp_lld.c
@@ -39,13 +39,16 @@
 /* Driver local definitions.                                                 */
 /*===========================================================================*/
 
-#ifndef	GDISP_SCREEN_HEIGHT
-	#define GDISP_SCREEN_HEIGHT		320
+#if defined(GDISP_SCREEN_HEIGHT)
+	#undef GISP_SCREEN_HEIGHT
 #endif
-#ifndef GDISP_SCREEN_WIDTH
-	#define GDISP_SCREEN_WIDTH		240
+#if defined(GDISP_SCREEN_WIDTH)
+	#undef GDISP_SCREEN_WIDTH
 #endif
 
+#define GDISP_SCREEN_HEIGHT		320
+#define GDISP_SCREEN_WIDTH		240
+
 #define GDISP_INITIAL_CONTRAST 		50
 #define GDISP_INITIAL_BACKLIGHT 	100