diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-02-28 15:42:50 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:54:46 -0700 |
| commit | dadb830dac401c4b1420ee2fd6c7559871b43319 (patch) | |
| tree | ca0b6ea4ed14bc7305bff267dc2e950cddfe7ecb /drivers/net | |
| parent | 9f47df264fa53e562cafa0de4a405d0846a81fbd (diff) | |
| download | blackbird-op-linux-dadb830dac401c4b1420ee2fd6c7559871b43319.tar.gz blackbird-op-linux-dadb830dac401c4b1420ee2fd6c7559871b43319.zip | |
[SUNGEM]: __sparc__ --> CONFIG_SPARC
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | 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 bb07b79817f4..4fa3e49f9358 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; |
