vserver 1.9.5.x5

[linux-2.6.git] / drivers / net / sk98lin / h / skdrv1st.h

diff --git a/drivers/net/sk98lin/h/skdrv1st.h b/drivers/net/sk98lin/h/skdrv1st.h
index 652775e..e65a19f 100644 (file)
--- a/drivers/net/sk98lin/h/skdrv1st.h
+++ b/drivers/net/sk98lin/h/skdrv1st.h
@@ -58,13 +58,6 @@ typedef struct s_AC  SK_AC;
 
 #define SK_ADDR_EQUAL(a1,a2)           (!memcmp(a1,a2,6))
 
-#if !defined(__OPTIMIZE__)  ||  !defined(__KERNEL__)
-#warning  You must compile this file with the correct options!
-#warning  See the last lines of the source file.
-#error You must compile this driver with "-O".
-#endif
-
-#include <linux/version.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -73,8 +66,8 @@ typedef struct s_AC   SK_AC;
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
+#include <linux/bitops.h>
 #include <asm/byteorder.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -116,7 +109,7 @@ typedef struct s_AC SK_AC;
 #define SK_MAX_MACS            2
 #define SK_MAX_NETS            2
 
-#define SK_IOC                 char*
+#define SK_IOC                 char __iomem *
 
 typedef struct s_DrvRlmtMbuf SK_MBUF;