Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d297c31fd101473983c17734a7e8a3752da1880f
Commit: d297c31fd101473983c17734a7e8a3752da1880f
Parent: 49345103fef36617abc9a649dfc34f7e921c6878
Author: David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Thu Mar 29 01:41:28 2007 -0700
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Thu Apr 26 01:54:57 2007 -0700
[TULIP]: Use pci_device_to_OF_node() on sparc.
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
drivers/net/tulip/tulip_core.c | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 81bcc56..e9bf526 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -37,7 +37,7 @@
#include <asm/uaccess.h>
#ifdef CONFIG_SPARC
-#include <asm/pbm.h>
+#include <asm/prom.h>
#endif
static char version[] __devinitdata =
@@ -1536,22 +1536,18 @@ static int __devinit tulip_init_one (struct pci_dev
*pdev,
that here as well. */
if (sum == 0 || sum == 6*0xff) {
#if defined(CONFIG_SPARC)
- struct pcidev_cookie *pcp = pdev->sysdata;
+ struct device_node *dp = pci_device_to_OF_node(pdev);
+ const unsigned char *addr;
+ int len;
#endif
eeprom_missing = 1;
for (i = 0; i < 5; i++)
dev->dev_addr[i] = last_phys_addr[i];
dev->dev_addr[i] = last_phys_addr[i] + 1;
#if defined(CONFIG_SPARC)
- if (pcp) {
- const unsigned char *addr;
- int len;
-
- addr = of_get_property(pcp->prom_node,
- "local-mac-address", &len);
- if (addr && len == 6)
- memcpy(dev->dev_addr, addr, 6);
- }
+ addr = of_get_property(dp, "local-mac-address", &len);
+ if (addr && len == 6)
+ memcpy(dev->dev_addr, addr, 6);
#endif
#if defined(__i386__) || defined(__x86_64__) /* Patch up x86 BIOS bug. */
if (last_irq)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
