diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
| commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
| tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /drivers/net/jme.h | |
| parent | 0b5adf92ec793c665b0de63ac146d190a921c391 (diff) | |
| parent | 6a740aa4f47b9f29bad5292cf51f008f3edad9b1 (diff) | |
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'drivers/net/jme.h')
| -rw-r--r-- | drivers/net/jme.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/jme.h b/drivers/net/jme.h index c19db9146a2f..07ad3a457185 100644 --- a/drivers/net/jme.h +++ b/drivers/net/jme.h | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #define __JME_H_INCLUDED__ | 25 | #define __JME_H_INCLUDED__ |
| 26 | 26 | ||
| 27 | #define DRV_NAME "jme" | 27 | #define DRV_NAME "jme" |
| 28 | #define DRV_VERSION "1.0.5" | 28 | #define DRV_VERSION "1.0.6" |
| 29 | #define PFX DRV_NAME ": " | 29 | #define PFX DRV_NAME ": " |
| 30 | 30 | ||
| 31 | #define PCI_DEVICE_ID_JMICRON_JMC250 0x0250 | 31 | #define PCI_DEVICE_ID_JMICRON_JMC250 0x0250 |