| 1 |
xmw 12/08/03 07:31:12 |
| 2 |
|
| 3 |
Added: linux-gpib-3.2.16-kernel-3.4-asm-includes.patch |
| 4 |
Log: |
| 5 |
Fix python support, restrict USE pcmcia (broken on kernels newer 2.6.38), fix firmware installation (bug 379393, thanks Nicolas Boichat) and remove unwanted precompiled binary generate_firmware, fix asm/system.h inclusion on kernel 3.4.0. |
| 6 |
|
| 7 |
(Portage version: 2.1.11.9/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-libs/linux-gpib/files/linux-gpib-3.2.16-kernel-3.4-asm-includes.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/linux-gpib/files/linux-gpib-3.2.16-kernel-3.4-asm-includes.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/linux-gpib/files/linux-gpib-3.2.16-kernel-3.4-asm-includes.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: linux-gpib-3.2.16-kernel-3.4-asm-includes.patch |
| 16 |
=================================================================== |
| 17 |
diff -Pdpru a/drivers/gpib/cb7210/cb7210_cs.c b/drivers/gpib/cb7210/cb7210_cs.c |
| 18 |
--- a/drivers/gpib/cb7210/cb7210_cs.c 2011-04-08 23:01:38.000000000 +0200 |
| 19 |
+++ b/drivers/gpib/cb7210/cb7210_cs.c 2012-05-28 10:45:35.120662078 +0200 |
| 20 |
@@ -34,7 +34,9 @@ |
| 21 |
#include <linux/version.h> |
| 22 |
#include <linux/module.h> |
| 23 |
#include <asm/io.h> |
| 24 |
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) |
| 25 |
#include <asm/system.h> |
| 26 |
+#endif |
| 27 |
|
| 28 |
#include <pcmcia/cs_types.h> |
| 29 |
#include <pcmcia/cs.h> |
| 30 |
diff -Pdpru a/drivers/gpib/ines/ines_cs.c b/drivers/gpib/ines/ines_cs.c |
| 31 |
--- a/drivers/gpib/ines/ines_cs.c 2010-08-25 19:45:09.000000000 +0200 |
| 32 |
+++ b/drivers/gpib/ines/ines_cs.c 2012-05-28 10:45:56.823537008 +0200 |
| 33 |
@@ -31,7 +31,9 @@ |
| 34 |
#include <linux/version.h> |
| 35 |
#include <linux/module.h> |
| 36 |
#include <asm/io.h> |
| 37 |
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) |
| 38 |
#include <asm/system.h> |
| 39 |
+#endif |
| 40 |
|
| 41 |
#include <pcmcia/cs_types.h> |
| 42 |
#include <pcmcia/cs.h> |
| 43 |
diff -Pdpru a/drivers/gpib/sys/ibsys.h b/drivers/gpib/sys/ibsys.h |
| 44 |
--- a/drivers/gpib/sys/ibsys.h 2006-12-21 21:43:40.000000000 +0100 |
| 45 |
+++ b/drivers/gpib/sys/ibsys.h 2012-05-28 11:38:56.261736416 +0200 |
| 46 |
@@ -10,13 +10,15 @@ |
| 47 |
#include <linux/slab.h> |
| 48 |
#include <linux/mm.h> |
| 49 |
#include <linux/timer.h> |
| 50 |
+#include <linux/version.h> |
| 51 |
|
| 52 |
#include <asm/io.h> |
| 53 |
-#include <asm/segment.h> |
| 54 |
#include <asm/irq.h> |
| 55 |
#include <asm/dma.h> |
| 56 |
#include <asm/uaccess.h> |
| 57 |
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) |
| 58 |
#include <asm/system.h> |
| 59 |
+#endif |
| 60 |
|
| 61 |
extern int gpib_allocate_board( gpib_board_t *board ); |
| 62 |
extern void gpib_deallocate_board( gpib_board_t *board ); |
| 63 |
diff -Pdpru a/drivers/gpib/tnt4882/tnt4882_cs.c b/drivers/gpib/tnt4882/tnt4882_cs.c |
| 64 |
--- a/drivers/gpib/tnt4882/tnt4882_cs.c 2010-08-25 19:47:55.000000000 +0200 |
| 65 |
+++ b/drivers/gpib/tnt4882/tnt4882_cs.c 2012-05-28 10:44:59.929243930 +0200 |
| 66 |
@@ -34,7 +34,9 @@ |
| 67 |
#include <linux/version.h> |
| 68 |
#include <linux/ioport.h> |
| 69 |
#include <asm/io.h> |
| 70 |
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) |
| 71 |
#include <asm/system.h> |
| 72 |
+#endif |
| 73 |
|
| 74 |
#include <pcmcia/cs_types.h> |
| 75 |
#include <pcmcia/cs.h> |
Archives