diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 12:36:38 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 12:36:38 +0200 |
| commit | 064fdcec9f72fa6616dc4d3bcf340705f27e5fe1 (patch) | |
| tree | 434cbf2d9e41ddcc3365cf6902ff8421ef9c9c9f /include/net.h | |
| parent | f56b064fa3d91afdf06d6a48e18063cfd3f0efe5 (diff) | |
| parent | 1906b87fe6da91bcd6c333acf1688479c8d460b2 (diff) | |
| download | barebox-064fdcec9f72fa6616dc4d3bcf340705f27e5fe1.tar.gz barebox-064fdcec9f72fa6616dc4d3bcf340705f27e5fe1.tar.xz | |
Merge branch 'for-next/imx-oftree'
Conflicts:
arch/arm/boards/freescale-mx51-pdk/board.c
Diffstat (limited to 'include/net.h')
| -rw-r--r-- | include/net.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net.h b/include/net.h index 72f02ce117..fa3c05a987 100644 --- a/include/net.h +++ b/include/net.h @@ -78,8 +78,13 @@ int eth_rx(void); /* Check for received packets */ static inline void eth_register_ethaddr(int ethid, const char *ethaddr) { } +static inline void of_eth_register_ethaddr(struct device_node *node, + const char *ethaddr) +{ +} #else void eth_register_ethaddr(int ethid, const char *ethaddr); +void of_eth_register_ethaddr(struct device_node *node, const char *ethaddr); #endif /* * Ethernet header |