diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/mvme147.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/mvme147.c')
| -rw-r--r-- | drivers/net/mvme147.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mvme147.c b/drivers/net/mvme147.c index 93c709d63e2f..3a7ad840d5b5 100644 --- a/drivers/net/mvme147.c +++ b/drivers/net/mvme147.c | |||
| @@ -10,11 +10,11 @@ | |||
| 10 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 11 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
| 12 | #include <linux/ioport.h> | 12 | #include <linux/ioport.h> |
| 13 | #include <linux/slab.h> | ||
| 14 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 15 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
| 17 | #include <linux/gfp.h> | ||
| 18 | /* Used for the temporal inet entries and routing */ | 18 | /* Used for the temporal inet entries and routing */ |
| 19 | #include <linux/socket.h> | 19 | #include <linux/socket.h> |
| 20 | #include <linux/route.h> | 20 | #include <linux/route.h> |