diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-04-20 10:02:01 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-04-20 10:02:01 -0400 |
| commit | 62910554656cdcd6b6f84a5154c4155aae4ca231 (patch) | |
| tree | dcf14004f6fd2ef7154362ff948bfeba0f3ea92d /drivers/net/ns83820.c | |
| parent | 22265a5c3c103cf8c50be62e6c90d045eb649e6d (diff) | |
| parent | ab9304717f7624c41927f442e6b6d418b2d8b3e4 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
net/ipv6/netfilter/ip6t_REJECT.c
net/netfilter/xt_limit.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
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> |