From patchwork Fri Jan 14 20:40:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3] cassini: Use local-mac-address prom property for Cassini MAC address From: David Miller X-Patchwork-Id: 79010 Message-Id: <20110114.124053.111572121.davem@davemloft.net> To: richm@oldelvet.org.uk Cc: sparclinux@vger.kernel.org, fberckel@xs4all.nl, julian.calaby@gmail.com, sinan@writeme.com, linux-kernel@vger.kernel.org Date: Fri, 14 Jan 2011 12:40:53 -0800 (PST) From: Richard Mortimer Date: Fri, 14 Jan 2011 11:39:28 +0000 > FYI Sinan Akman has reported that cassini does not compile for x86 any > longer. Message included below. > > Does anyone have suggestions as to the best way to resolve this? I'll fix it like this: -------------------- cassini: Fix build bustage on x86. Unfortunately, not all CONFIG_OF platforms provide pci_device_to_OF_node(). Change the test to CONFIG_SPARC for now to deal with the build regressions. Signed-off-by: David S. Miller --- drivers/net/cassini.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c index 7206ab2..3437613 100644 --- a/drivers/net/cassini.c +++ b/drivers/net/cassini.c @@ -3203,7 +3203,7 @@ static int cas_get_vpd_info(struct cas *cp, unsigned char *dev_addr, int phy_type = CAS_PHY_MII_MDIO0; /* default phy type */ int mac_off = 0; -#if defined(CONFIG_OF) +#if defined(CONFIG_SPARC) const unsigned char *addr; #endif @@ -3354,7 +3354,7 @@ use_random_mac_addr: if (found & VPD_FOUND_MAC) goto done; -#if defined(CONFIG_OF) +#if defined(CONFIG_SPARC) addr = of_get_property(cp->of_node, "local-mac-address", NULL); if (addr != NULL) { memcpy(dev_addr, addr, 6); @@ -5031,7 +5031,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev, cp->msg_enable = (cassini_debug < 0) ? CAS_DEF_MSG_ENABLE : cassini_debug; -#if defined(CONFIG_OF) +#if defined(CONFIG_SPARC) cp->of_node = pci_device_to_OF_node(pdev); #endif