diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-09 19:06:04 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-09 19:06:04 -0500 |
| commit | 31e7f1ff3c5d39a70da85f7d81a1ab1f4e64fa97 (patch) | |
| tree | a6cb8f14b1182e5dce55d13e52c1182a8c7e0402 /drivers/net/via-velocity.c | |
| parent | fca5dcd4835ed09bb1a48a355344aff7a25c76e0 (diff) | |
| parent | 6730c3c14421b7c924d06e31bb66e0adad225547 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/net/via-velocity.c')
| -rw-r--r-- | drivers/net/via-velocity.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index a368d08e7d19..82c6b757d306 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
| @@ -61,7 +61,6 @@ | |||
| 61 | #include <linux/timer.h> | 61 | #include <linux/timer.h> |
| 62 | #include <linux/slab.h> | 62 | #include <linux/slab.h> |
| 63 | #include <linux/interrupt.h> | 63 | #include <linux/interrupt.h> |
| 64 | #include <linux/version.h> | ||
| 65 | #include <linux/string.h> | 64 | #include <linux/string.h> |
| 66 | #include <linux/wait.h> | 65 | #include <linux/wait.h> |
| 67 | #include <asm/io.h> | 66 | #include <asm/io.h> |