Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 2523
b: refs/heads/master
c: 0adbb44
h: refs/heads/master
i:
  2521: accafc0
  2519: fc757e4
v: v3
  • Loading branch information
Hirokazu Takata authored and Linus Torvalds committed Jun 22, 2005
1 parent 046ebb1 commit edd00f2
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 472 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1cc1265e9a8579be0029cd675ec22a6151893e04
refs/heads/master: 0adbb44a146d6dff3f74ea7a9d3826f8942ed709
4 changes: 2 additions & 2 deletions trunk/drivers/net/8390.c
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,9 @@ void ei_tx_timeout(struct net_device *dev)
unsigned long icucr;

local_irq_save(flags);
icucr = inl(ICUCR1);
icucr = inl(M32R_ICU_CR1_PORTL);
icucr |= M32R_ICUCR_ISMOD11;
outl(icucr, ICUCR1);
outl(icucr, M32R_ICU_CR1_PORTL);
local_irq_restore(flags);
#endif
ei_local->stat.tx_errors++;
Expand Down
Loading

0 comments on commit edd00f2

Please sign in to comment.