Author: nick
Date: 2012-07-27 16:26:01 +0100 (Fri, 27 Jul 2012)
New Revision: 1939
Modified:
balloon/branches/menuconfig2/package/kernel/patches/3.5/balloon3-minipug.patch
Log:
minor patch for Makefile
Modified: balloon/branches/menuconfig2/package/kernel/patches/3.5/balloon3-minipug.patch
===================================================================
--- balloon/branches/menuconfig2/package/kernel/patches/3.5/balloon3-minipug.patch 2012-07-27 15:25:37 UTC (rev 1938)
+++ balloon/branches/menuconfig2/package/kernel/patches/3.5/balloon3-minipug.patch 2012-07-27 15:26:01 UTC (rev 1939)
@@ -6,11 +6,11 @@
Signed-off-by: Wookey <
wookey@wookware.org>
-Index: linux-2.6.39.1/drivers/char/Kconfig
+Index: linux-3.5/drivers/char/Kconfig
===================================================================
---- linux-2.6.39.1.orig/drivers/char/Kconfig 2011-06-03 16:11:11.000000000 +0100
-+++ linux-2.6.39.1/drivers/char/Kconfig 2011-06-03 16:18:26.000000000 +0100
-@@ -640,5 +640,19 @@
+--- linux-3.5.orig/drivers/char/Kconfig 2012-07-23 09:54:00.000000000 -0400
++++ linux-3.5/drivers/char/Kconfig 2012-07-23 09:59:05.000000000 -0400
+@@ -628,5 +628,19 @@
help
Enable procfs access to haptic inteface as /proc/samosa/haptic
@@ -30,19 +30,21 @@
+
endmenu
-Index: linux-2.6.39.1/drivers/char/Makefile
+Index: linux-3.5/drivers/char/Makefile
===================================================================
---- linux-2.6.39.1.orig/drivers/char/Makefile 2011-06-03 16:11:11.000000000 +0100
-+++ linux-2.6.39.1/drivers/char/Makefile 2011-06-03 16:16:38.000000000 +0100
-@@ -65,3 +65,4 @@
+--- linux-3.5.orig/drivers/char/Makefile 2012-07-23 09:54:00.000000000 -0400
++++ linux-3.5/drivers/char/Makefile 2012-07-23 09:59:46.000000000 -0400
+@@ -63,5 +63,6 @@
js-rtc-y = rtc.o
obj-$(CONFIG_SAMOSA) += samosa.o
+obj-$(CONFIG_MINIPUG) += minipug.o
-Index: linux-2.6.39.1/drivers/char/minipug.c
+
+ obj-$(CONFIG_TILE_SROM) += tile-srom.o
+Index: linux-3.5/drivers/char/minipug.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.39.1/drivers/char/minipug.c 2011-06-03 16:16:38.000000000 +0100
++++ linux-3.5/drivers/char/minipug.c 2012-07-23 09:59:05.000000000 -0400
@@ -0,0 +1,1235 @@
+/*
+ * linux/drivers/char/minipug.c
@@ -1279,10 +1281,10 @@
+MODULE_AUTHOR("Nick Bane <nick@cecomputing.co.uk>");
+MODULE_DESCRIPTION("Minipug display interface via samosa bus on Balloon");
+MODULE_LICENSE("GPL");
-Index: linux-2.6.39.1/include/video/minipug.h
+Index: linux-3.5/include/video/minipug.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.39.1/include/video/minipug.h 2011-06-03 16:16:38.000000000 +0100
++++ linux-3.5/include/video/minipug.h 2012-07-23 09:59:05.000000000 -0400
@@ -0,0 +1,2 @@
+/* graphics display interface utility for Toby Churchill Minipug device */
+void minipug_update_graphics(unsigned int disp, unsigned char *data, unsigned int len, unsigned int offset);