linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / amba / clcd.h

diff --git a/include/linux/amba/clcd.h b/include/linux/amba/clcd.h
index 29c0448..6b8d73d 100644 (file)
--- 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;