aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sunhme.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-06-23 20:31:12 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-24 02:15:56 -0400
commit9e326acf567b605cf4177081cc7367c24ec10a66 (patch)
tree96a175748a36eeaa181ae3ce87ef19c47dc1d73b /drivers/net/sunhme.c
parent411aa5540536feace62c97478a8ea5dab7469377 (diff)
[NET] sunhme: Kill __sparc__ and __sparc_v9__ ifdefs.
Use CONFIG_SPARC and CONFIG_SPARC64 instead. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sunhme.c')
-rw-r--r--drivers/net/sunhme.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index cfec9e2c0932..9f4367e2aa0d 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -40,14 +40,14 @@
40#include <asm/dma.h> 40#include <asm/dma.h>
41#include <asm/byteorder.h> 41#include <asm/byteorder.h>
42 42
43#ifdef __sparc__ 43#ifdef CONFIG_SPARC
44#include <asm/idprom.h> 44#include <asm/idprom.h>
45#include <asm/sbus.h> 45#include <asm/sbus.h>
46#include <asm/openprom.h> 46#include <asm/openprom.h>
47#include <asm/oplib.h> 47#include <asm/oplib.h>
48#include <asm/prom.h> 48#include <asm/prom.h>
49#include <asm/auxio.h> 49#include <asm/auxio.h>
50#ifndef __sparc_v9__ 50#ifndef CONFIG_SPARC64
51#include <asm/io-unit.h> 51#include <asm/io-unit.h>
52#endif 52#endif
53#endif 53#endif
@@ -58,7 +58,7 @@
58 58
59#ifdef CONFIG_PCI 59#ifdef CONFIG_PCI
60#include <linux/pci.h> 60#include <linux/pci.h>
61#ifdef __sparc__ 61#ifdef CONFIG_SPARC
62#include <asm/pbm.h> 62#include <asm/pbm.h>
63#endif 63#endif
64#endif 64#endif
@@ -1611,7 +1611,7 @@ static int happy_meal_init(struct happy_meal *hp)
1611 HMD(("happy_meal_init: old[%08x] bursts<", 1611 HMD(("happy_meal_init: old[%08x] bursts<",
1612 hme_read32(hp, gregs + GREG_CFG))); 1612 hme_read32(hp, gregs + GREG_CFG)));
1613 1613
1614#ifndef __sparc__ 1614#ifndef CONFIG_SPARC
1615 /* It is always PCI and can handle 64byte bursts. */ 1615 /* It is always PCI and can handle 64byte bursts. */
1616 hme_write32(hp, gregs + GREG_CFG, GREG_CFG_BURST64); 1616 hme_write32(hp, gregs + GREG_CFG, GREG_CFG_BURST64);
1617#else 1617#else
@@ -1648,7 +1648,7 @@ static int happy_meal_init(struct happy_meal *hp)
1648 HMD(("XXX>")); 1648 HMD(("XXX>"));
1649 hme_write32(hp, gregs + GREG_CFG, 0); 1649 hme_write32(hp, gregs + GREG_CFG, 0);
1650 } 1650 }
1651#endif /* __sparc__ */ 1651#endif /* CONFIG_SPARC */
1652 1652
1653 /* Turn off interrupts we do not want to hear. */ 1653 /* Turn off interrupts we do not want to hear. */
1654 HMD((", enable global interrupts, ")); 1654 HMD((", enable global interrupts, "));
@@ -2919,7 +2919,7 @@ err_out:
2919#endif 2919#endif
2920 2920
2921#ifdef CONFIG_PCI 2921#ifdef CONFIG_PCI
2922#ifndef __sparc__ 2922#ifndef CONFIG_SPARC
2923static int is_quattro_p(struct pci_dev *pdev) 2923static int is_quattro_p(struct pci_dev *pdev)
2924{ 2924{
2925 struct pci_dev *busdev = pdev->bus->self; 2925 struct pci_dev *busdev = pdev->bus->self;
@@ -3007,12 +3007,12 @@ static void get_hme_mac_nonsparc(struct pci_dev *pdev, unsigned char *dev_addr)
3007 get_random_bytes(&dev_addr[3], 3); 3007 get_random_bytes(&dev_addr[3], 3);
3008 return; 3008 return;
3009} 3009}
3010#endif /* !(__sparc__) */ 3010#endif /* !(CONFIG_SPARC) */
3011 3011
3012static int __init happy_meal_pci_init(struct pci_dev *pdev) 3012static int __init happy_meal_pci_init(struct pci_dev *pdev)
3013{ 3013{
3014 struct quattro *qp = NULL; 3014 struct quattro *qp = NULL;
3015#ifdef __sparc__ 3015#ifdef CONFIG_SPARC
3016 struct pcidev_cookie *pcp; 3016 struct pcidev_cookie *pcp;
3017#endif 3017#endif
3018 struct happy_meal *hp; 3018 struct happy_meal *hp;
@@ -3024,7 +3024,7 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
3024 int err; 3024 int err;
3025 3025
3026 /* Now make sure pci_dev cookie is there. */ 3026 /* Now make sure pci_dev cookie is there. */
3027#ifdef __sparc__ 3027#ifdef CONFIG_SPARC
3028 pcp = pdev->sysdata; 3028 pcp = pdev->sysdata;
3029 if (pcp == NULL) { 3029 if (pcp == NULL) {
3030 printk(KERN_ERR "happymeal(PCI): Some PCI device info missing\n"); 3030 printk(KERN_ERR "happymeal(PCI): Some PCI device info missing\n");
@@ -3102,7 +3102,7 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
3102 dev->dev_addr[i] = macaddr[i]; 3102 dev->dev_addr[i] = macaddr[i];
3103 macaddr[5]++; 3103 macaddr[5]++;
3104 } else { 3104 } else {
3105#ifdef __sparc__ 3105#ifdef CONFIG_SPARC
3106 unsigned char *addr; 3106 unsigned char *addr;
3107 int len; 3107 int len;
3108 3108
@@ -3126,7 +3126,7 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
3126 hp->bigmacregs = (hpreg_base + 0x6000UL); 3126 hp->bigmacregs = (hpreg_base + 0x6000UL);
3127 hp->tcvregs = (hpreg_base + 0x7000UL); 3127 hp->tcvregs = (hpreg_base + 0x7000UL);
3128 3128
3129#ifdef __sparc__ 3129#ifdef CONFIG_SPARC
3130 hp->hm_revision = of_getintprop_default(pcp->prom_node, "hm-rev", 0xff); 3130 hp->hm_revision = of_getintprop_default(pcp->prom_node, "hm-rev", 0xff);
3131 if (hp->hm_revision == 0xff) { 3131 if (hp->hm_revision == 0xff) {
3132 unsigned char prev; 3132 unsigned char prev;
@@ -3151,7 +3151,7 @@ static int __init happy_meal_pci_init(struct pci_dev *pdev)
3151 /* And of course, indicate this is PCI. */ 3151 /* And of course, indicate this is PCI. */
3152 hp->happy_flags |= HFLAG_PCI; 3152 hp->happy_flags |= HFLAG_PCI;
3153 3153
3154#ifdef __sparc__ 3154#ifdef CONFIG_SPARC
3155 /* Assume PCI happy meals can handle all burst sizes. */ 3155 /* Assume PCI happy meals can handle all burst sizes. */
3156 hp->happy_bursts = DMA_BURSTBITS; 3156 hp->happy_bursts = DMA_BURSTBITS;
3157#endif 3157#endif