diff options
Diffstat (limited to 'drivers/net/stmmac')
-rw-r--r-- | drivers/net/stmmac/dwmac100.c | 1 | ||||
-rw-r--r-- | drivers/net/stmmac/dwmac1000_core.c | 1 | ||||
-rw-r--r-- | drivers/net/stmmac/stmmac_main.c | 4 | ||||
-rw-r--r-- | drivers/net/stmmac/stmmac_mdio.c | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/stmmac/dwmac100.c b/drivers/net/stmmac/dwmac100.c index c0a1c9df3ac7..1ca84eab289c 100644 --- a/drivers/net/stmmac/dwmac100.c +++ b/drivers/net/stmmac/dwmac100.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/crc32.h> | 29 | #include <linux/crc32.h> |
30 | #include <linux/mii.h> | 30 | #include <linux/mii.h> |
31 | #include <linux/phy.h> | 31 | #include <linux/phy.h> |
32 | #include <linux/slab.h> | ||
32 | 33 | ||
33 | #include "common.h" | 34 | #include "common.h" |
34 | #include "dwmac100.h" | 35 | #include "dwmac100.h" |
diff --git a/drivers/net/stmmac/dwmac1000_core.c b/drivers/net/stmmac/dwmac1000_core.c index bf73fda6adfb..f9c7c1cbda93 100644 --- a/drivers/net/stmmac/dwmac1000_core.c +++ b/drivers/net/stmmac/dwmac1000_core.c | |||
@@ -27,6 +27,7 @@ | |||
27 | *******************************************************************************/ | 27 | *******************************************************************************/ |
28 | 28 | ||
29 | #include <linux/crc32.h> | 29 | #include <linux/crc32.h> |
30 | #include <linux/slab.h> | ||
30 | #include "dwmac1000.h" | 31 | #include "dwmac1000.h" |
31 | 32 | ||
32 | static void dwmac1000_core_init(unsigned long ioaddr) | 33 | static void dwmac1000_core_init(unsigned long ioaddr) |
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index 963f591f1e0e..cc532ef28c8f 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" |
@@ -1685,7 +1686,8 @@ static int stmmac_dvr_probe(struct platform_device *pdev) | |||
1685 | } | 1686 | } |
1686 | pr_info("done!\n"); | 1687 | pr_info("done!\n"); |
1687 | 1688 | ||
1688 | if (!request_mem_region(res->start, resource_size(res), pdev->name)) { | 1689 | if (!request_mem_region(res->start, resource_size(res), |
1690 | pdev->name)) { | ||
1689 | pr_err("%s: ERROR: memory allocation failed" | 1691 | pr_err("%s: ERROR: memory allocation failed" |
1690 | "cannot get the I/O addr 0x%x\n", | 1692 | "cannot get the I/O addr 0x%x\n", |
1691 | __func__, (unsigned int)res->start); | 1693 | __func__, (unsigned int)res->start); |
diff --git a/drivers/net/stmmac/stmmac_mdio.c b/drivers/net/stmmac/stmmac_mdio.c index fffe1d037fe6..40b2c7929719 100644 --- a/drivers/net/stmmac/stmmac_mdio.c +++ b/drivers/net/stmmac/stmmac_mdio.c | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | #include <linux/mii.h> | 27 | #include <linux/mii.h> |
28 | #include <linux/phy.h> | 28 | #include <linux/phy.h> |
29 | #include <linux/slab.h> | ||
29 | 30 | ||
30 | #include "stmmac.h" | 31 | #include "stmmac.h" |
31 | 32 | ||