aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/sungem.c8
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 @@
64#include <asm/uaccess.h> 64#include <asm/uaccess.h>
65#include <asm/irq.h> 65#include <asm/irq.h>
66 66
67#ifdef __sparc__ 67#ifdef CONFIG_SPARC
68#include <asm/idprom.h> 68#include <asm/idprom.h>
69#include <asm/openprom.h> 69#include <asm/openprom.h>
70#include <asm/oplib.h> 70#include <asm/oplib.h>
@@ -2849,7 +2849,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
2849 return rc; 2849 return rc;
2850} 2850}
2851 2851
2852#if (!defined(__sparc__) && !defined(CONFIG_PPC_PMAC)) 2852#if (!defined(CONFIG_SPARC) && !defined(CONFIG_PPC_PMAC))
2853/* Fetch MAC address from vital product data of PCI ROM. */ 2853/* Fetch MAC address from vital product data of PCI ROM. */
2854static int find_eth_addr_in_vpd(void __iomem *rom_base, int len, unsigned char *dev_addr) 2854static int find_eth_addr_in_vpd(void __iomem *rom_base, int len, unsigned char *dev_addr)
2855{ 2855{
@@ -2904,11 +2904,11 @@ static void get_gem_mac_nonobp(struct pci_dev *pdev, unsigned char *dev_addr)
2904 2904
2905static int __devinit gem_get_device_address(struct gem *gp) 2905static int __devinit gem_get_device_address(struct gem *gp)
2906{ 2906{
2907#if defined(__sparc__) || defined(CONFIG_PPC_PMAC) 2907#if defined(CONFIG_SPARC) || defined(CONFIG_PPC_PMAC)
2908 struct net_device *dev = gp->dev; 2908 struct net_device *dev = gp->dev;
2909#endif 2909#endif
2910 2910
2911#if defined(__sparc__) 2911#if defined(CONFIG_SPARC)
2912 struct pci_dev *pdev = gp->pdev; 2912 struct pci_dev *pdev = gp->pdev;
2913 struct pcidev_cookie *pcp = pdev->sysdata; 2913 struct pcidev_cookie *pcp = pdev->sysdata;
2914 int use_idprom = 1; 2914 int use_idprom = 1;