X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Famba%2Fclcd.h;fp=include%2Flinux%2Famba%2Fclcd.h;h=6b8d73dc1ab09d269972d1373984150ebebb5c86;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=29c0448265cf7c7e4b9312f3cd684a319fcf8de3;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/include/linux/amba/clcd.h b/include/linux/amba/clcd.h
index 29c044826..6b8d73dc1 100644
--- a/include/linux/amba/clcd.h
+++ b/include/linux/amba/clcd.h
@@ -9,6 +9,7 @@
  * License.  See the file COPYING in the main directory of this archive
  * for more details.
  */
+#include <linux/config.h>
 #include <linux/fb.h>
 
 /*
@@ -53,7 +54,6 @@
 #define CNTL_LCDBPP4		(2 << 1)
 #define CNTL_LCDBPP8		(3 << 1)
 #define CNTL_LCDBPP16		(4 << 1)
-#define CNTL_LCDBPP16_565	(6 << 1)
 #define CNTL_LCDBPP24		(5 << 1)
 #define CNTL_LCDBW		(1 << 4)
 #define CNTL_LCDTFT		(1 << 5)
@@ -209,16 +209,7 @@ static inline void clcdfb_decode(struct clcd_fb *fb, struct clcd_regs *regs)
 		val |= CNTL_LCDBPP8;
 		break;
 	case 16:
-		/*
-		 * PL110 cannot choose between 5551 and 565 modes in
-		 * its control register
-		 */
-		if ((fb->dev->periphid & 0x000fffff) == 0x00041110)
-			val |= CNTL_LCDBPP16;
-		else if (fb->fb.var.green.length == 5)
-			val |= CNTL_LCDBPP16;
-		else
-			val |= CNTL_LCDBPP16_565;
+		val |= CNTL_LCDBPP16;
 		break;
 	case 32:
 		val |= CNTL_LCDBPP24;