diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 14:16:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 14:16:30 -0400 |
| commit | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (patch) | |
| tree | 09933113cf28f253db1dd539463bdab741d67139 /drivers/net/tulip/timer.c | |
| parent | 62c592edead3c3a045662595f7ade3c12f133373 (diff) | |
| parent | ed735ccbefaf7e5e3ef61418f7e209b8c59308a7 (diff) | |
Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
Diffstat (limited to 'drivers/net/tulip/timer.c')
| -rw-r--r-- | drivers/net/tulip/timer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/tulip/timer.c b/drivers/net/tulip/timer.c index 691568283553..e058a9fbfe88 100644 --- a/drivers/net/tulip/timer.c +++ b/drivers/net/tulip/timer.c | |||
| @@ -39,7 +39,6 @@ void tulip_timer(unsigned long data) | |||
| 39 | case MX98713: | 39 | case MX98713: |
| 40 | case COMPEX9881: | 40 | case COMPEX9881: |
| 41 | case DM910X: | 41 | case DM910X: |
| 42 | case ULI526X: | ||
| 43 | default: { | 42 | default: { |
| 44 | struct medialeaf *mleaf; | 43 | struct medialeaf *mleaf; |
| 45 | unsigned char *p; | 44 | unsigned char *p; |