diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-14 17:50:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-14 17:50:46 -0400 |
| commit | b793b3a75e12ae4576f3d9b6013c8a7d8b0277b8 (patch) | |
| tree | e493685833f06462afd5d4edc6e231c33131a633 /drivers/net/r6040.c | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
| parent | c0912585ec8b64d846d56995241f2c8a7f48ee75 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/r6040.c')
| -rw-r--r-- | drivers/net/r6040.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 6531ff565c54..5d86281d9363 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/version.h> | ||
| 28 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
| 29 | #include <linux/string.h> | 28 | #include <linux/string.h> |
| 30 | #include <linux/timer.h> | 29 | #include <linux/timer.h> |