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

Author: cmjones
Date: 2012-08-16 12:18:30 +0100 (Thu, 16 Aug 2012)
New Revision: 1949

Modified:
balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3-lmr5428.patch
Log:
Fixed LMR5428 patch for 2.6.39.4

Modified: balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3-lmr5428.patch
===================================================================
--- balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3-lmr5428.patch    2012-08-16 10:54:44 UTC (rev 1948)
+++ balloon/branches/menuconfig2/package/kernel/patches/2.6.39.4/balloon3-lmr5428.patch    2012-08-16 11:18:30 UTC (rev 1949)
@@ -1,7 +1,7 @@
-Index: linux-2.6.29.1/drivers/char/charset.h
+Index: linux-2.6.39.4/drivers/char/charset.h
 ===================================================================
 --- /dev/null    1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.1/drivers/char/charset.h    2009-09-21 14:49:12.000000000 +0100
++++ linux-2.6.39.4/drivers/char/charset.h    2012-08-16 12:11:00.000000000 +0100
 @@ -0,0 +1,98 @@
 +unsigned char charset[]={\
 +    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0x20 ' ' */ \
@@ -101,10 +101,10 @@
 +    0x02,0x01,0x02,0x04,0x02,0x00,0x00,0x00, /* 0x7e '~' */ \
 +    0x55,0x2a,0x55,0x2a,0x55,0x00,0x00,0x00, /* 0x7f '' */ \
 +    };
-Index: linux-2.6.29.1/drivers/char/lmr5428.c
+Index: linux-2.6.39.4/drivers/char/lmr5428.c
 ===================================================================
 --- /dev/null    1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.1/drivers/char/lmr5428.c    2009-09-22 03:40:18.000000000 +0100
++++ linux-2.6.39.4/drivers/char/lmr5428.c    2012-08-16 12:11:51.000000000 +0100
 @@ -0,0 +1,912 @@
 +/*
 + * linux/drivers/char/lmr5428.c
@@ -1018,32 +1018,30 @@
 +MODULE_AUTHOR("Chris Jones <chris@martin-jones.com>");
 +MODULE_DESCRIPTION("LMR5428 display interface via samosa bus on Balloon");
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.29.1/drivers/char/Kconfig
+Index: linux-2.6.39.4/drivers/char/Kconfig
 ===================================================================
---- linux-2.6.29.1.orig/drivers/char/Kconfig    2009-09-21 14:49:11.000000000 +0100
-+++ linux-2.6.29.1/drivers/char/Kconfig    2009-09-22 03:38:59.000000000 +0100
-@@ -666,6 +666,12 @@
-     help
-       Virtio console for use with lguest and other hypervisors.
+--- linux-2.6.39.4.orig/drivers/char/Kconfig    2012-08-16 12:16:19.000000000 +0100
++++ linux-2.6.39.4/drivers/char/Kconfig    2012-08-16 12:17:29.000000000 +0100
+@@ -198,6 +198,13 @@

+ source "drivers/char/ipmi/Kconfig"
+ 
 +config LMR5428
 +    tristate "LMR5428 Display"
 +    depends on SAMOSA
 +    default m
 +    help
 +      Densitron LMR5428 LCD display driven down Samosa bus (for Balloonboard).
- 
- config HVCS
-     tristate "IBM Hypervisor Virtual Console Server support"
-Index: linux-2.6.29.1/drivers/char/Makefile
++
+ config DS1620
+     tristate "NetWinder thermometer support"
+     depends on ARCH_NETWINDER
+Index: linux-2.6.39.4/drivers/char/Makefile
 ===================================================================
---- linux-2.6.29.1.orig/drivers/char/Makefile    2009-09-21 14:49:11.000000000 +0100
-+++ linux-2.6.29.1/drivers/char/Makefile    2009-09-22 03:38:59.000000000 +0100
-@@ -112,6 +112,7 @@
+--- linux-2.6.39.4.orig/drivers/char/Makefile    2012-08-16 12:17:39.000000000 +0100
++++ linux-2.6.39.4/drivers/char/Makefile    2012-08-16 12:18:00.000000000 +0100
+@@ -65,3 +65,4 @@
  js-rtc-y = rtc.o

  obj-$(CONFIG_SAMOSA)        += samosa.o
 +obj-$(CONFIG_LMR5428)        += lmr5428.o
- 
- # Files generated that shall be removed upon make clean
- clean-files := consolemap_deftbl.c defkeymap.c