diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/net/sunlance.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/sunlance.c')
| -rw-r--r-- | drivers/net/sunlance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index d7c73f478ef5..0c21653ff9f9 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
| @@ -78,7 +78,6 @@ static char lancestr[] = "LANCE"; | |||
| 78 | #include <linux/interrupt.h> | 78 | #include <linux/interrupt.h> |
| 79 | #include <linux/ioport.h> | 79 | #include <linux/ioport.h> |
| 80 | #include <linux/in.h> | 80 | #include <linux/in.h> |
| 81 | #include <linux/slab.h> | ||
| 82 | #include <linux/string.h> | 81 | #include <linux/string.h> |
| 83 | #include <linux/delay.h> | 82 | #include <linux/delay.h> |
| 84 | #include <linux/init.h> | 83 | #include <linux/init.h> |
| @@ -94,6 +93,7 @@ static char lancestr[] = "LANCE"; | |||
| 94 | #include <linux/dma-mapping.h> | 93 | #include <linux/dma-mapping.h> |
| 95 | #include <linux/of.h> | 94 | #include <linux/of.h> |
| 96 | #include <linux/of_device.h> | 95 | #include <linux/of_device.h> |
| 96 | #include <linux/gfp.h> | ||
| 97 | 97 | ||
| 98 | #include <asm/system.h> | 98 | #include <asm/system.h> |
| 99 | #include <asm/io.h> | 99 | #include <asm/io.h> |