git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
include
/
pcmcia
/
ciscode.h
diff --git
a/include/pcmcia/ciscode.h
b/include/pcmcia/ciscode.h
index
ad6e278
..
b417985
100644
(file)
--- a/
include/pcmcia/ciscode.h
+++ b/
include/pcmcia/ciscode.h
@@
-119,7
+119,7
@@
#define MANFID_TOSHIBA 0x0098
-#define MANFID_UNGERMANN 0x02c0
+#define MANFID_UNGERMANN
0x02c0
#define MANFID_XIRCOM 0x0105