[Balloon-svn] r1946 - balloon/branches/menuconfig2/package/k…

Author: nick
Date: 2012-08-06 16:09:11 +0100 (Mon, 06 Aug 2012)
New Revision: 1946

Modified:
balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/s6d04k1.patch
Log:
add back in dbfix1 for display config parameters

Modified: balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/s6d04k1.patch
===================================================================
--- balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/s6d04k1.patch    2012-07-31 16:29:19 UTC (rev 1945)
+++ balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/s6d04k1.patch    2012-08-06 15:09:11 UTC (rev 1946)
@@ -1,7 +1,7 @@
 Index: linux-2.6.39.4/drivers/video/Kconfig
 ===================================================================
 --- linux-2.6.39.4.orig/drivers/video/Kconfig    2011-08-03 20:43:28.000000000 +0100
-+++ linux-2.6.39.4/drivers/video/Kconfig    2012-06-19 18:04:05.000000000 +0100
++++ linux-2.6.39.4/drivers/video/Kconfig    2012-08-06 16:07:43.000000000 +0100
 @@ -634,6 +634,17 @@
        To compile this driver as a module, choose M here: the
        module will be called bfin_adv7393fb.
@@ -41,7 +41,7 @@
 Index: linux-2.6.39.4/drivers/video/Makefile
 ===================================================================
 --- linux-2.6.39.4.orig/drivers/video/Makefile    2011-08-03 20:43:28.000000000 +0100
-+++ linux-2.6.39.4/drivers/video/Makefile    2012-06-19 18:04:05.000000000 +0100
++++ linux-2.6.39.4/drivers/video/Makefile    2012-08-06 16:07:43.000000000 +0100
 @@ -140,6 +140,7 @@
  obj-$(CONFIG_FB_NUC900)           += nuc900fb.o
  obj-$(CONFIG_FB_JZ4740)          += jz4740_fb.o
@@ -53,7 +53,7 @@
 Index: linux-2.6.39.4/drivers/video/s6d04k1.c
 ===================================================================
 --- /dev/null    1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.39.4/drivers/video/s6d04k1.c    2012-06-18 19:18:23.000000000 +0100
++++ linux-2.6.39.4/drivers/video/s6d04k1.c    2012-08-06 15:22:48.000000000 +0100
 @@ -0,0 +1,1038 @@
 +/*
 + * linux/drivers/char/s6d04k1.c
@@ -1096,7 +1096,7 @@
 Index: linux-2.6.39.4/drivers/video/s6d04k1.h
 ===================================================================
 --- /dev/null    1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.39.4/drivers/video/s6d04k1.h    2012-06-18 19:18:23.000000000 +0100
++++ linux-2.6.39.4/drivers/video/s6d04k1.h    2012-08-06 15:22:48.000000000 +0100
 @@ -0,0 +1,185 @@
 +// s6d04k1 LCD Display Driver interface.
 +// Driver for CO240QGLH-T Active OLED display (240 x 320)
@@ -1286,7 +1286,7 @@
 Index: linux-2.6.39.4/drivers/video/display/Kconfig
 ===================================================================
 --- linux-2.6.39.4.orig/drivers/video/display/Kconfig    2011-08-03 20:43:28.000000000 +0100
-+++ linux-2.6.39.4/drivers/video/display/Kconfig    2012-06-18 19:18:23.000000000 +0100
++++ linux-2.6.39.4/drivers/video/display/Kconfig    2012-08-06 15:22:48.000000000 +0100
 @@ -21,4 +21,8 @@
  comment "Display hardware drivers"
      depends on DISPLAY_SUPPORT
@@ -1299,7 +1299,7 @@
 Index: linux-2.6.39.4/drivers/video/display/Makefile
 ===================================================================
 --- linux-2.6.39.4.orig/drivers/video/display/Makefile    2011-08-03 20:43:28.000000000 +0100
-+++ linux-2.6.39.4/drivers/video/display/Makefile    2012-06-18 19:18:23.000000000 +0100
++++ linux-2.6.39.4/drivers/video/display/Makefile    2012-08-06 15:22:48.000000000 +0100
 @@ -3,4 +3,5 @@
  display-objs                := display-sysfs.o

@@ -1309,7 +1309,7 @@
 Index: linux-2.6.39.4/drivers/video/display/display-s6d04k1.c
 ===================================================================
 --- /dev/null    1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.39.4/drivers/video/display/display-s6d04k1.c    2012-06-19 18:03:59.000000000 +0100
++++ linux-2.6.39.4/drivers/video/display/display-s6d04k1.c    2012-08-06 15:57:28.000000000 +0100
 @@ -0,0 +1,1022 @@
 +/*
 + * linux/drivers/char/s6d04k1.c
@@ -1355,7 +1355,7 @@
 +#include "linux/fb.h"
 +#endif
 +
-+//#define BISSET_FIX0
++#define BISSET_FIX0
 +#define BISSET_FIX1
 +#define BISSET_FIX2
 +
@@ -2336,7 +2336,7 @@
 Index: linux-2.6.39.4/drivers/video/display/display-s6d04k1.h
 ===================================================================
 --- /dev/null    1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.39.4/drivers/video/display/display-s6d04k1.h    2012-06-18 19:18:23.000000000 +0100
++++ linux-2.6.39.4/drivers/video/display/display-s6d04k1.h    2012-08-06 15:22:48.000000000 +0100
 @@ -0,0 +1,185 @@
 +// s6d04k1 LCD Display Driver interface.
 +// Driver for CO240QGLH-T Active OLED display (240 x 320)