Commit 92d76e81b9df5f33b0c9e2091e892560a437a15f
1 parent
f1e02ed109
Exists in
master
and in
39 other branches
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>
Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff
drivers/net/cassini.c
| ... | ... | @@ -3203,7 +3203,7 @@ |
| 3203 | 3203 | int phy_type = CAS_PHY_MII_MDIO0; /* default phy type */ |
| 3204 | 3204 | int mac_off = 0; |
| 3205 | 3205 | |
| 3206 | -#if defined(CONFIG_OF) | |
| 3206 | +#if defined(CONFIG_SPARC) | |
| 3207 | 3207 | const unsigned char *addr; |
| 3208 | 3208 | #endif |
| 3209 | 3209 | |
| ... | ... | @@ -3354,7 +3354,7 @@ |
| 3354 | 3354 | if (found & VPD_FOUND_MAC) |
| 3355 | 3355 | goto done; |
| 3356 | 3356 | |
| 3357 | -#if defined(CONFIG_OF) | |
| 3357 | +#if defined(CONFIG_SPARC) | |
| 3358 | 3358 | addr = of_get_property(cp->of_node, "local-mac-address", NULL); |
| 3359 | 3359 | if (addr != NULL) { |
| 3360 | 3360 | memcpy(dev_addr, addr, 6); |
| ... | ... | @@ -5031,7 +5031,7 @@ |
| 5031 | 5031 | cp->msg_enable = (cassini_debug < 0) ? CAS_DEF_MSG_ENABLE : |
| 5032 | 5032 | cassini_debug; |
| 5033 | 5033 | |
| 5034 | -#if defined(CONFIG_OF) | |
| 5034 | +#if defined(CONFIG_SPARC) | |
| 5035 | 5035 | cp->of_node = pci_device_to_OF_node(pdev); |
| 5036 | 5036 | #endif |
| 5037 | 5037 |