diff -Pdpru a/drivers/gpib/cb7210/cb7210_cs.c b/drivers/gpib/cb7210/cb7210_cs.c
--- a/drivers/gpib/cb7210/cb7210_cs.c	2011-04-08 23:01:38.000000000 +0200
+++ b/drivers/gpib/cb7210/cb7210_cs.c	2012-05-28 10:45:35.120662078 +0200
@@ -34,7 +34,9 @@
 #include <linux/version.h>
 #include <linux/module.h>
 #include <asm/io.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
 #include <asm/system.h>
+#endif
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
diff -Pdpru a/drivers/gpib/ines/ines_cs.c b/drivers/gpib/ines/ines_cs.c
--- a/drivers/gpib/ines/ines_cs.c	2010-08-25 19:45:09.000000000 +0200
+++ b/drivers/gpib/ines/ines_cs.c	2012-05-28 10:45:56.823537008 +0200
@@ -31,7 +31,9 @@
 #include <linux/version.h>
 #include <linux/module.h>
 #include <asm/io.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
 #include <asm/system.h>
+#endif
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
diff -Pdpru a/drivers/gpib/sys/ibsys.h b/drivers/gpib/sys/ibsys.h
--- a/drivers/gpib/sys/ibsys.h	2006-12-21 21:43:40.000000000 +0100
+++ b/drivers/gpib/sys/ibsys.h	2012-05-28 11:38:56.261736416 +0200
@@ -10,13 +10,15 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/timer.h>
+#include <linux/version.h>
 
 #include <asm/io.h>
-#include <asm/segment.h>
 #include <asm/irq.h>
 #include <asm/dma.h>
 #include <asm/uaccess.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
 #include <asm/system.h>
+#endif
 
 extern int gpib_allocate_board( gpib_board_t *board );
 extern void gpib_deallocate_board( gpib_board_t *board );
diff -Pdpru a/drivers/gpib/tnt4882/tnt4882_cs.c b/drivers/gpib/tnt4882/tnt4882_cs.c
--- a/drivers/gpib/tnt4882/tnt4882_cs.c	2010-08-25 19:47:55.000000000 +0200
+++ b/drivers/gpib/tnt4882/tnt4882_cs.c	2012-05-28 10:44:59.929243930 +0200
@@ -34,7 +34,9 @@
 #include <linux/version.h>
 #include <linux/ioport.h>
 #include <asm/io.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
 #include <asm/system.h>
+#endif
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>