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/3c501.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/3c501.c')
| -rw-r--r-- | drivers/net/3c501.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c index b6de7b1e2a5c..3ea42ff17657 100644 --- a/drivers/net/3c501.c +++ b/drivers/net/3c501.c | |||
| @@ -117,7 +117,6 @@ static const char version[] = | |||
| 117 | #include <linux/fcntl.h> | 117 | #include <linux/fcntl.h> |
| 118 | #include <linux/ioport.h> | 118 | #include <linux/ioport.h> |
| 119 | #include <linux/interrupt.h> | 119 | #include <linux/interrupt.h> |
| 120 | #include <linux/slab.h> | ||
| 121 | #include <linux/string.h> | 120 | #include <linux/string.h> |
| 122 | #include <linux/errno.h> | 121 | #include <linux/errno.h> |
| 123 | #include <linux/spinlock.h> | 122 | #include <linux/spinlock.h> |