Skip to content

L
linux-davinci-2.6.23
Commit dadb830d authored by David S. Miller's avatar David S. Miller
Browse files
Options

[SUNGEM]: __sparc__ --> CONFIG_SPARC 

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f47df26
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
drivers/net/sungem.c
View file @ dadb830d
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/irq.h> #include <asm/irq.h>
#ifdef __sparc__ #ifdef CONFIG_SPARC
#include <asm/idprom.h> #include <asm/idprom.h>
#include <asm/openprom.h> #include <asm/openprom.h>
#include <asm/oplib.h> #include <asm/oplib.h>
...@@ -2849,7 +2849,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -2849,7 +2849,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
return rc; 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. */ /* 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) 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) ...@@ -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) 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; struct net_device *dev = gp->dev;
#endif #endif
#if defined(__sparc__) #if defined(CONFIG_SPARC)
struct pci_dev *pdev = gp->pdev; struct pci_dev *pdev = gp->pdev;
struct pcidev_cookie *pcp = pdev->sysdata; struct pcidev_cookie *pcp = pdev->sysdata;
int use_idprom = 1; int use_idprom = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment