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 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima...
[pandora-kernel.git]
/
drivers
/
net
/
s2io.h
diff --git
a/drivers/net/s2io.h
b/drivers/net/s2io.h
index
ae3c8e7
..
d559692
100644
(file)
--- a/
drivers/net/s2io.h
+++ b/
drivers/net/s2io.h
@@
-967,8
+967,8
@@
struct s2io_nic {
u8 serial_num[VPD_STRING_LEN];
};
-#define RESET_ERROR 1
;
-#define CMD_ERROR 2
;
+#define RESET_ERROR 1
+#define CMD_ERROR 2
/* OS related system calls */
#ifndef readq