summaryrefslogtreecommitdiffstats
path: root/arch/microblaze/include/asm
diff options
context:
space:
mode:
authorDavid Daney2010-10-27 00:07:13 +0200
committerGrant Likely2010-11-01 06:08:14 +0100
commit4b6ba8aacbb3185703b797286547d0f8f3859b02 (patch)
treef4e04c3b19d6bf7c7429c0cf678c534838e2990d /arch/microblaze/include/asm
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadkernel-qcow2-linux-4b6ba8aacbb3185703b797286547d0f8f3859b02.tar.gz
kernel-qcow2-linux-4b6ba8aacbb3185703b797286547d0f8f3859b02.tar.xz
kernel-qcow2-linux-4b6ba8aacbb3185703b797286547d0f8f3859b02.zip
of/net: Move of_get_mac_address() to a common source file.
There are two identical implementations of of_get_mac_address(), one each in arch/powerpc/kernel/prom_parse.c and arch/microblaze/kernel/prom_parse.c. Move this function to a new common file of_net.{c,h} and adjust all the callers to include the new header. Signed-off-by: David Daney <ddaney@caviumnetworks.com> [grant.likely@secretlab.ca: protect header with #ifdef] Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/microblaze/include/asm')
-rw-r--r--arch/microblaze/include/asm/prom.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h
index bdc38312ae4a..2e72af078b05 100644
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
@@ -64,9 +64,6 @@ extern void kdump_move_device_tree(void);
/* CPU OF node matching */
struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);
-/* Get the MAC address */
-extern const void *of_get_mac_address(struct device_node *np);
-
/**
* of_irq_map_pci - Resolve the interrupt for a PCI device
* @pdev: the device whose interrupt is to be resolved