diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /drivers/net/wan/pc300_drv.c | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/net/wan/pc300_drv.c')
| -rw-r--r-- | drivers/net/wan/pc300_drv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index f4f1c00d0d23..3f744c643094 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c | |||
| @@ -228,6 +228,7 @@ static char rcsid[] = | |||
| 228 | #include <linux/etherdevice.h> | 228 | #include <linux/etherdevice.h> |
| 229 | #include <linux/spinlock.h> | 229 | #include <linux/spinlock.h> |
| 230 | #include <linux/if.h> | 230 | #include <linux/if.h> |
| 231 | #include <linux/slab.h> | ||
| 231 | #include <net/arp.h> | 232 | #include <net/arp.h> |
| 232 | 233 | ||
| 233 | #include <asm/io.h> | 234 | #include <asm/io.h> |