diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-14 12:39:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-14 12:39:59 -0800 |
| commit | 92d76e81b9df5f33b0c9e2091e892560a437a15f (patch) | |
| tree | 9889bcc252932fbf1bc9523482e4ee0059d35b71 /drivers/net | |
| parent | f1e02ed109df5f99abf942b8ccc99960cb09dd38 (diff) | |
| download | linux-92d76e81b9df5f33b0c9e2091e892560a437a15f.tar.bz2 | |
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 <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | 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 7206ab2cbbf8..3437613f0454 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 |