projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[deliverable/linux.git]
/
drivers
/
net
/
cassini.c
diff --git
a/drivers/net/cassini.c
b/drivers/net/cassini.c
index 7206ab2cbbf8e16526775de5ec4d2f9bb5789f60..3437613f0454e97d00676766f6f7058abb5bbc5c 100644
(file)
--- 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;
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
const unsigned char *addr;
#endif
@@
-3354,7
+3354,7
@@
use_random_mac_addr:
if (found & VPD_FOUND_MAC)
goto done;
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);
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;
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
cp->of_node = pci_device_to_OF_node(pdev);
#endif
This page took
0.024919 seconds
and
5
git commands to generate.