diff options
| author | luka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-10-03 02:50:00 +0000 |
|---|---|---|
| committer | luka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-10-03 02:50:00 +0000 |
| commit | cd36fc6be2d5a4598695f75dcc8142afe115f075 (patch) | |
| tree | 8d013582ea989c45b94bd78cc7c5d7ab1c058854 /target/linux/kirkwood/patches-3.10/0050-of-add-support-for-parsing-mac-addresses-from-mtd.patch | |
| parent | 9a129ff72240a88041a68ee2d9dfd009aa04111b (diff) | |
kirkwood: update patches and configuration (3.10)
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38295 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/kirkwood/patches-3.10/0050-of-add-support-for-parsing-mac-addresses-from-mtd.patch')
| -rw-r--r-- | target/linux/kirkwood/patches-3.10/0050-of-add-support-for-parsing-mac-addresses-from-mtd.patch | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/kirkwood/patches-3.10/0050-of-add-support-for-parsing-mac-addresses-from-mtd.patch b/target/linux/kirkwood/patches-3.10/0050-of-add-support-for-parsing-mac-addresses-from-mtd.patch index bc0cbb2e0b..f956c58737 100644 --- a/target/linux/kirkwood/patches-3.10/0050-of-add-support-for-parsing-mac-addresses-from-mtd.patch +++ b/target/linux/kirkwood/patches-3.10/0050-of-add-support-for-parsing-mac-addresses-from-mtd.patch @@ -8,8 +8,6 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> drivers/of/of_net.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) -diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c -index ffab033..8b40ac6 100644 --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c @@ -10,6 +10,7 @@ @@ -20,7 +18,7 @@ index ffab033..8b40ac6 100644 /** * It maps 'enum phy_interface_t' found in include/linux/phy.h -@@ -55,6 +56,103 @@ const int of_get_phy_mode(struct device_node *np) +@@ -55,6 +56,103 @@ const int of_get_phy_mode(struct device_ } EXPORT_SYMBOL_GPL(of_get_phy_mode); @@ -124,7 +122,7 @@ index ffab033..8b40ac6 100644 /** * Search the device tree for the best MAC address to use. 'mac-address' is * checked first, because that is supposed to contain to "most recent" MAC -@@ -89,6 +187,6 @@ const void *of_get_mac_address(struct device_node *np) +@@ -89,6 +187,6 @@ const void *of_get_mac_address(struct de if (pp && (pp->length == 6) && is_valid_ether_addr(pp->value)) return pp->value; @@ -132,6 +130,3 @@ index ffab033..8b40ac6 100644 + return of_get_mac_address_mtd(np); } EXPORT_SYMBOL(of_get_mac_address); --- -1.8.4.rc1 - |