aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.1
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-07-14 07:38:47 +0000
committerJohn Crispin <john@openwrt.org>2015-07-14 07:38:47 +0000
commit1b7379689525ef0ada52035c4461acf7e7e4921c (patch)
tree06496388defd7d539cb6d9b08907e1b227a4ccd2 /target/linux/generic/patches-4.1
parenta9b06a49a8fc977f784c1696dc587e9d8db62678 (diff)
downloadupstream-1b7379689525ef0ada52035c4461acf7e7e4921c.tar.gz
upstream-1b7379689525ef0ada52035c4461acf7e7e4921c.tar.bz2
upstream-1b7379689525ef0ada52035c4461acf7e7e4921c.zip
kernel: fix build with CONFIG_MTD unset
Fixed typo in the patch provided by Hauke: https://lists.openwrt.org/pipermail/openwrt-devel/2015-July/034274.html Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> SVN-Revision: 46346
Diffstat (limited to 'target/linux/generic/patches-4.1')
-rw-r--r--target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch13
1 files changed, 11 insertions, 2 deletions
diff --git a/target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch b/target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch
index 65428981ec..688cf6e44a 100644
--- a/target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch
+++ b/target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch
@@ -23,11 +23,12 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
/**
* of_get_phy_mode - Get phy mode for given device_node
-@@ -80,3 +81,43 @@ const void *of_get_mac_address(struct de
+@@ -80,3 +81,45 @@ const void *of_get_mac_address(struct de
return of_get_mac_addr(np, "address");
}
EXPORT_SYMBOL(of_get_mac_address);
+
++#ifdef CONFIG_MTD
+int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac)
+{
+ struct device_node *mtd_np = NULL;
@@ -67,13 +68,21 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ return ret;
+}
+EXPORT_SYMBOL_GPL(of_get_mac_address_mtd);
++#endif
--- a/include/linux/of_net.h
+++ b/include/linux/of_net.h
-@@ -13,6 +13,7 @@
+@@ -13,6 +13,14 @@
struct net_device;
extern int of_get_phy_mode(struct device_node *np);
extern const void *of_get_mac_address(struct device_node *np);
++#ifdef CONFIG_MTD
+extern int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac);
++#else
++static inline int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac)
++{
++ return -ENOENT;
++}
++#endif
extern struct net_device *of_find_net_device_by_node(struct device_node *np);
#else
static inline int of_get_phy_mode(struct device_node *np)