diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/net/ns83820.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 8dd509c09bc8..e88e97cd1b10 100644 --- a/drivers/net/ns83820.c +++ b/drivers/net/ns83820.c | |||
| @@ -116,6 +116,7 @@ | |||
| 116 | #include <linux/if_vlan.h> | 116 | #include <linux/if_vlan.h> |
| 117 | #include <linux/rtnetlink.h> | 117 | #include <linux/rtnetlink.h> |
| 118 | #include <linux/jiffies.h> | 118 | #include <linux/jiffies.h> |
| 119 | #include <linux/slab.h> | ||
| 119 | 120 | ||
| 120 | #include <asm/io.h> | 121 | #include <asm/io.h> |
| 121 | #include <asm/uaccess.h> | 122 | #include <asm/uaccess.h> |