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/mac89x0.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/mac89x0.c')
| -rw-r--r-- | drivers/net/mac89x0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c index c292a608f9a9..c0876e915eed 100644 --- a/drivers/net/mac89x0.c +++ b/drivers/net/mac89x0.c | |||
| @@ -88,7 +88,6 @@ static char *version = | |||
| 88 | #include <linux/interrupt.h> | 88 | #include <linux/interrupt.h> |
| 89 | #include <linux/ioport.h> | 89 | #include <linux/ioport.h> |
| 90 | #include <linux/in.h> | 90 | #include <linux/in.h> |
| 91 | #include <linux/slab.h> | ||
| 92 | #include <linux/string.h> | 91 | #include <linux/string.h> |
| 93 | #include <linux/nubus.h> | 92 | #include <linux/nubus.h> |
| 94 | #include <linux/errno.h> | 93 | #include <linux/errno.h> |
| @@ -98,6 +97,7 @@ static char *version = | |||
| 98 | #include <linux/skbuff.h> | 97 | #include <linux/skbuff.h> |
| 99 | #include <linux/delay.h> | 98 | #include <linux/delay.h> |
| 100 | #include <linux/bitops.h> | 99 | #include <linux/bitops.h> |
| 100 | #include <linux/gfp.h> | ||
| 101 | 101 | ||
| 102 | #include <asm/system.h> | 102 | #include <asm/system.h> |
| 103 | #include <asm/io.h> | 103 | #include <asm/io.h> |