diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:35:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:36:16 -0400 |
| commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
| tree | c803925f1d5bf2237e7495d306bf43929df0c952 /drivers/net/sunbmac.c | |
| parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
| parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/sunbmac.c')
| -rw-r--r-- | drivers/net/sunbmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c index a0bd361d5eca..ed7865a0b5b2 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
| 12 | #include <linux/ioport.h> | 12 | #include <linux/ioport.h> |
| 13 | #include <linux/in.h> | 13 | #include <linux/in.h> |
| 14 | #include <linux/slab.h> | ||
| 15 | #include <linux/string.h> | 14 | #include <linux/string.h> |
| 16 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| @@ -25,6 +24,7 @@ | |||
| 25 | #include <linux/dma-mapping.h> | 24 | #include <linux/dma-mapping.h> |
| 26 | #include <linux/of.h> | 25 | #include <linux/of.h> |
| 27 | #include <linux/of_device.h> | 26 | #include <linux/of_device.h> |
| 27 | #include <linux/gfp.h> | ||
| 28 | 28 | ||
| 29 | #include <asm/auxio.h> | 29 | #include <asm/auxio.h> |
| 30 | #include <asm/byteorder.h> | 30 | #include <asm/byteorder.h> |