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/stmmac/stmmac_main.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/stmmac/stmmac_main.c')
| -rw-r--r-- | drivers/net/stmmac/stmmac_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index 55317adec33d..4111a85ec80e 100644 --- a/drivers/net/stmmac/stmmac_main.c +++ b/drivers/net/stmmac/stmmac_main.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/phy.h> | 44 | #include <linux/phy.h> |
| 45 | #include <linux/if_vlan.h> | 45 | #include <linux/if_vlan.h> |
| 46 | #include <linux/dma-mapping.h> | 46 | #include <linux/dma-mapping.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | #include "stmmac.h" | 48 | #include "stmmac.h" |
| 48 | 49 | ||
| 49 | #define STMMAC_RESOURCE_NAME "stmmaceth" | 50 | #define STMMAC_RESOURCE_NAME "stmmaceth" |