Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=dadb830dac401c4b1420ee2fd6c7559871b43319
Commit: dadb830dac401c4b1420ee2fd6c7559871b43319
Parent: 9f47df264fa53e562cafa0de4a405d0846a81fbd
Author: David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Wed Feb 28 15:42:50 2007 -0800
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Thu Apr 26 01:54:46 2007 -0700
[SUNGEM]: __sparc__ --> CONFIG_SPARC
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
drivers/net/sungem.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index bb07b79..4fa3e49 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -64,7 +64,7 @@
#include <asm/uaccess.h>
#include <asm/irq.h>
-#ifdef __sparc__
+#ifdef CONFIG_SPARC
#include <asm/idprom.h>
#include <asm/openprom.h>
#include <asm/oplib.h>
@@ -2849,7 +2849,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq
*ifr, int cmd)
return rc;
}
-#if (!defined(__sparc__) && !defined(CONFIG_PPC_PMAC))
+#if (!defined(CONFIG_SPARC) && !defined(CONFIG_PPC_PMAC))
/* Fetch MAC address from vital product data of PCI ROM. */
static int find_eth_addr_in_vpd(void __iomem *rom_base, int len, unsigned char
*dev_addr)
{
@@ -2904,11 +2904,11 @@ static void get_gem_mac_nonobp(struct pci_dev *pdev,
unsigned char *dev_addr)
static int __devinit gem_get_device_address(struct gem *gp)
{
-#if defined(__sparc__) || defined(CONFIG_PPC_PMAC)
+#if defined(CONFIG_SPARC) || defined(CONFIG_PPC_PMAC)
struct net_device *dev = gp->dev;
#endif
-#if defined(__sparc__)
+#if defined(CONFIG_SPARC)
struct pci_dev *pdev = gp->pdev;
struct pcidev_cookie *pcp = pdev->sysdata;
int use_idprom = 1;
-
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
