git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[pandora-kernel.git]
/
drivers
/
net
/
jme.h
diff --git
a/drivers/net/jme.h
b/drivers/net/jme.h
index
07ad3a4
..
eac0926
100644
(file)
--- a/
drivers/net/jme.h
+++ b/
drivers/net/jme.h
@@
-3,6
+3,7
@@
*
* Copyright 2008 JMicron Technology Corporation
* http://www.jmicron.com/
*
* Copyright 2008 JMicron Technology Corporation
* http://www.jmicron.com/
+ * Copyright (c) 2009 - 2010 Guo-Fu Tseng <cooldavid@cooldavid.org>
*
* Author: Guo-Fu Tseng <cooldavid@cooldavid.org>
*
*
* Author: Guo-Fu Tseng <cooldavid@cooldavid.org>
*
@@
-25,7
+26,7
@@
#define __JME_H_INCLUDED__
#define DRV_NAME "jme"
#define __JME_H_INCLUDED__
#define DRV_NAME "jme"
-#define DRV_VERSION "1.0.
6
"
+#define DRV_VERSION "1.0.
7
"
#define PFX DRV_NAME ": "
#define PCI_DEVICE_ID_JMICRON_JMC250 0x0250
#define PFX DRV_NAME ": "
#define PCI_DEVICE_ID_JMICRON_JMC250 0x0250
@@
-41,9
+42,6
@@
NETIF_MSG_TX_ERR | \
NETIF_MSG_HW)
NETIF_MSG_TX_ERR | \
NETIF_MSG_HW)
-#define jeprintk(pdev, fmt, args...) \
- printk(KERN_ERR PFX fmt, ## args)
-
#ifdef TX_DEBUG
#define tx_dbg(priv, fmt, args...) \
printk(KERN_DEBUG "%s: " fmt, (priv)->dev->name, ##args)
#ifdef TX_DEBUG
#define tx_dbg(priv, fmt, args...) \
printk(KERN_DEBUG "%s: " fmt, (priv)->dev->name, ##args)