--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
-@@ -545,6 +545,63 @@ int eth_platform_get_mac_address(struct
+@@ -539,6 +539,63 @@ int eth_platform_get_mac_address(struct
}
EXPORT_SYMBOL(eth_platform_get_mac_address);
/**
* Obtain the MAC address from an nvmem cell named 'mac-address' associated
* with given device.
-@@ -558,19 +615,23 @@ int nvmem_get_mac_address(struct device
+@@ -552,19 +609,23 @@ int nvmem_get_mac_address(struct device
{
struct nvmem_cell *cell;
const void *mac;
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
-@@ -544,6 +544,63 @@ int eth_platform_get_mac_address(struct
+@@ -538,6 +538,63 @@ int eth_platform_get_mac_address(struct
}
EXPORT_SYMBOL(eth_platform_get_mac_address);
/**
* nvmem_get_mac_address - Obtain the MAC address from an nvmem cell named
* 'mac-address' associated with given device.
-@@ -557,19 +614,23 @@ int nvmem_get_mac_address(struct device
+@@ -551,19 +608,23 @@ int nvmem_get_mac_address(struct device
{
struct nvmem_cell *cell;
const void *mac;