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 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
[pandora-kernel.git]
/
drivers
/
net
/
lib82596.c
diff --git
a/drivers/net/lib82596.c
b/drivers/net/lib82596.c
index
c27f429
..
9e04289
100644
(file)
--- a/
drivers/net/lib82596.c
+++ b/
drivers/net/lib82596.c
@@
-161,7
+161,7
@@
enum commands {
#define RX_SUSPEND 0x0030
#define RX_ABORT 0x0040
-#define TX_TIMEOUT
5
+#define TX_TIMEOUT
(HZ/20)
struct i596_reg {