diff options
| author | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
| commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
| tree | 81b1a2305d16c873371b65c5a863c0268036cefe /drivers/net/macsonic.c | |
| parent | 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff) | |
| parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/macsonic.c')
| -rw-r--r-- | drivers/net/macsonic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c index 24109c288108..adb54fe2d82a 100644 --- a/drivers/net/macsonic.c +++ b/drivers/net/macsonic.c | |||
| @@ -35,11 +35,11 @@ | |||
| 35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 36 | #include <linux/types.h> | 36 | #include <linux/types.h> |
| 37 | #include <linux/fcntl.h> | 37 | #include <linux/fcntl.h> |
| 38 | #include <linux/gfp.h> | ||
| 38 | #include <linux/interrupt.h> | 39 | #include <linux/interrupt.h> |
| 39 | #include <linux/init.h> | 40 | #include <linux/init.h> |
| 40 | #include <linux/ioport.h> | 41 | #include <linux/ioport.h> |
| 41 | #include <linux/in.h> | 42 | #include <linux/in.h> |
| 42 | #include <linux/slab.h> | ||
| 43 | #include <linux/string.h> | 43 | #include <linux/string.h> |
| 44 | #include <linux/delay.h> | 44 | #include <linux/delay.h> |
| 45 | #include <linux/nubus.h> | 45 | #include <linux/nubus.h> |
| @@ -50,6 +50,7 @@ | |||
| 50 | #include <linux/platform_device.h> | 50 | #include <linux/platform_device.h> |
| 51 | #include <linux/dma-mapping.h> | 51 | #include <linux/dma-mapping.h> |
| 52 | #include <linux/bitrev.h> | 52 | #include <linux/bitrev.h> |
| 53 | #include <linux/slab.h> | ||
| 53 | 54 | ||
| 54 | #include <asm/bootinfo.h> | 55 | #include <asm/bootinfo.h> |
| 55 | #include <asm/system.h> | 56 | #include <asm/system.h> |