summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/include/mach
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2009-04-02 08:33:14 +0200
committerEric Miao <eric.miao@marvell.com>2009-04-04 10:26:34 +0800
commit22a0200b18b8526043d3014efdaf839b01767111 (patch)
tree5438a411a8382ae10a6ed99577ad65d54bed660e /arch/arm/mach-pxa/include/mach
parent50f6bb0ab75794ad02cb5db503cc8c99465ceaf4 (diff)
downloadblackbird-op-linux-22a0200b18b8526043d3014efdaf839b01767111.tar.gz
blackbird-op-linux-22a0200b18b8526043d3014efdaf839b01767111.zip
[ARM] pxa/colibri: provide MAC address from ATAG_SERIAL
In 67fca028f1535e510689d2e444b0289e264e05c1, the ax88796 ethernet driver learned a way to let the platform data hand in the MAC address. Use it here as the original Colibri bootloader passes in a MAC address via ATAG_SERIAL. Reported-by: Matthias Meier <matthias.j.meier@gmx.net> Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/include/mach')
-rw-r--r--arch/arm/mach-pxa/include/mach/colibri.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h
index 3f2a01d6a03c..306ad64409be 100644
--- a/arch/arm/mach-pxa/include/mach/colibri.h
+++ b/arch/arm/mach-pxa/include/mach/colibri.h
@@ -16,6 +16,10 @@ extern void colibri_pxa3xx_init_lcd(int bl_pin);
static inline void colibri_pxa3xx_init_lcd(int) {}
#endif
+#if defined(CONFIG_AX88796)
+extern void colibri_pxa3xx_init_eth(struct ax_plat_data *plat_data);
+#endif
+
/* physical memory regions */
#define COLIBRI_SDRAM_BASE 0xa0000000 /* SDRAM region */
OpenPOWER on IntegriCloud