diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /drivers/net/ns83820.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
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> |