diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 08:03:40 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 08:03:40 -0500 |
| commit | 0a75c23a009ff65f651532cecc16675d05f4de37 (patch) | |
| tree | bdcd6158758fe1810f0ddddb80d2816779518688 /drivers/net/ns83820.c | |
| parent | 34b8c399dc04c8e51f014b73458e654570698597 (diff) | |
| parent | db9edfd7e339ca4113153d887e782dd05be5a9eb (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/ns83820.c')
| -rw-r--r-- | drivers/net/ns83820.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index f857ae94d261..b0c3b6ab6263 100644 --- a/drivers/net/ns83820.c +++ b/drivers/net/ns83820.c | |||
| @@ -115,6 +115,7 @@ | |||
| 115 | #include <linux/ethtool.h> | 115 | #include <linux/ethtool.h> |
| 116 | #include <linux/timer.h> | 116 | #include <linux/timer.h> |
| 117 | #include <linux/if_vlan.h> | 117 | #include <linux/if_vlan.h> |
| 118 | #include <linux/rtnetlink.h> | ||
| 118 | 119 | ||
| 119 | #include <asm/io.h> | 120 | #include <asm/io.h> |
| 120 | #include <asm/uaccess.h> | 121 | #include <asm/uaccess.h> |