X-Git-Url: http://bbs.cooldavid.org/git/?p=jme.git;a=blobdiff_plain;f=jme.h;h=536a7f7b598e33d7f6e103a9e546f374bdec0449;hp=3dafe833ba2b284696f8adcb60f47995877fb3ec;hb=f6d5c552ae8da4c81052642d05d0a7e84912d418;hpb=8588b84ba1ccfa3e442fe44cf5cc3e6c49a6d430

diff --git a/jme.h b/jme.h
index 3dafe83..536a7f7 100644
--- a/jme.h
+++ b/jme.h
@@ -27,7 +27,7 @@
 #include <linux/interrupt.h>
 
 #define DRV_NAME	"jme"
-#define DRV_VERSION	"1.0.8-jmmod"
+#define DRV_VERSION	"1.0.8.2-jmmod"
 #define PFX		DRV_NAME ": "
 
 #define PCI_DEVICE_ID_JMICRON_JMC250	0x0250
@@ -43,11 +43,11 @@
 	NETIF_MSG_TX_ERR | \
 	NETIF_MSG_HW)
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
+#ifndef pr_err
 #define pr_err(fmt, arg...) \
 	printk(KERN_ERR fmt, ##arg)
 #endif
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,33)
+#ifndef netdev_err
 #define netdev_err(netdev, fmt, arg...) \
 	pr_err(fmt, ##arg)
 #endif
@@ -95,11 +95,15 @@ do {									\
 #define msg_hw(priv, fmt, args...) \
 	jme_msg(KERN_ERR, hw, priv, fmt, ## args)
 
+#ifndef netif_info
 #define netif_info(priv, type, dev, fmt, args...) \
 	msg_ ## type(priv, fmt, ## args)
+#endif
+#ifndef netif_err
 #define netif_err(priv, type, dev, fmt, args...) \
 	msg_ ## type(priv, fmt, ## args)
 #endif
+#endif
 
 #ifndef NETIF_F_TSO6
 #define NETIF_F_TSO6 0