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
This commit is contained in:
parent
a9b06a49a8
commit
1b73796895
3 changed files with 33 additions and 6 deletions
|
@ -23,11 +23,12 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
|
||||
/**
|
||||
* of_get_phy_mode - Get phy mode for given device_node
|
||||
@@ -75,3 +76,43 @@ const void *of_get_mac_address(struct de
|
||||
@@ -75,3 +76,45 @@ const void *of_get_mac_address(struct de
|
||||
return NULL;
|
||||
}
|
||||
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
|
||||
@@ -11,6 +11,7 @@
|
||||
@@ -11,6 +11,14 @@
|
||||
#include <linux/of.h>
|
||||
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
|
||||
#else
|
||||
static inline int of_get_phy_mode(struct device_node *np)
|
||||
{
|
||||
|
|
|
@ -23,11 +23,12 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||
|
||||
/**
|
||||
* of_get_phy_mode - Get phy mode for given device_node
|
||||
@@ -75,3 +76,43 @@ const void *of_get_mac_address(struct de
|
||||
@@ -75,3 +76,45 @@ const void *of_get_mac_address(struct de
|
||||
return NULL;
|
||||
}
|
||||
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
|
||||
@@ -11,6 +11,7 @@
|
||||
@@ -11,6 +11,14 @@
|
||||
#include <linux/of.h>
|
||||
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
|
||||
#else
|
||||
static inline int of_get_phy_mode(struct device_node *np)
|
||||
{
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue