aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sunhme.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/sunhme.c')
-rw-r--r--drivers/net/sunhme.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index c6f5bc3c042f..6779ac1f904a 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -505,7 +505,7 @@ static void happy_meal_tcvr_write(struct happy_meal *hp,
505 unsigned short value) 505 unsigned short value)
506{ 506{
507 int tries = TCVR_WRITE_TRIES; 507 int tries = TCVR_WRITE_TRIES;
508 508
509 ASD(("happy_meal_tcvr_write: reg=0x%02x value=%04x\n", reg, value)); 509 ASD(("happy_meal_tcvr_write: reg=0x%02x value=%04x\n", reg, value));
510 510
511 /* Welcome to Sun Microsystems, can I take your order please? */ 511 /* Welcome to Sun Microsystems, can I take your order please? */
@@ -1778,7 +1778,7 @@ static void happy_meal_set_initial_advertisement(struct happy_meal *hp)
1778static int happy_meal_is_not_so_happy(struct happy_meal *hp, u32 status) 1778static int happy_meal_is_not_so_happy(struct happy_meal *hp, u32 status)
1779{ 1779{
1780 int reset = 0; 1780 int reset = 0;
1781 1781
1782 /* Only print messages for non-counter related interrupts. */ 1782 /* Only print messages for non-counter related interrupts. */
1783 if (status & (GREG_STAT_STSTERR | GREG_STAT_TFIFO_UND | 1783 if (status & (GREG_STAT_STSTERR | GREG_STAT_TFIFO_UND |
1784 GREG_STAT_MAXPKTERR | GREG_STAT_RXERR | 1784 GREG_STAT_MAXPKTERR | GREG_STAT_RXERR |
@@ -3002,7 +3002,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
3002 printk(KERN_ERR "happymeal(PCI): Some PCI device info missing\n"); 3002 printk(KERN_ERR "happymeal(PCI): Some PCI device info missing\n");
3003 return -ENODEV; 3003 return -ENODEV;
3004 } 3004 }
3005 3005
3006 strcpy(prom_name, pcp->prom_node->name); 3006 strcpy(prom_name, pcp->prom_node->name);
3007#else 3007#else
3008 if (is_quattro_p(pdev)) 3008 if (is_quattro_p(pdev))
@@ -3046,7 +3046,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
3046 hp->qfe_parent = qp; 3046 hp->qfe_parent = qp;
3047 hp->qfe_ent = qfe_slot; 3047 hp->qfe_ent = qfe_slot;
3048 qp->happy_meals[qfe_slot] = dev; 3048 qp->happy_meals[qfe_slot] = dev;
3049 } 3049 }
3050 3050
3051 hpreg_res = pci_resource_start(pdev, 0); 3051 hpreg_res = pci_resource_start(pdev, 0);
3052 err = -ENODEV; 3052 err = -ENODEV;
@@ -3090,7 +3090,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
3090 get_hme_mac_nonsparc(pdev, &dev->dev_addr[0]); 3090 get_hme_mac_nonsparc(pdev, &dev->dev_addr[0]);
3091#endif 3091#endif
3092 } 3092 }
3093 3093
3094 /* Layout registers. */ 3094 /* Layout registers. */
3095 hp->gregs = (hpreg_base + 0x0000UL); 3095 hp->gregs = (hpreg_base + 0x0000UL);
3096 hp->etxregs = (hpreg_base + 0x2000UL); 3096 hp->etxregs = (hpreg_base + 0x2000UL);
@@ -3201,7 +3201,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
3201 qpdev->device == PCI_DEVICE_ID_DEC_21153) 3201 qpdev->device == PCI_DEVICE_ID_DEC_21153)
3202 printk("DEC 21153 PCI Bridge\n"); 3202 printk("DEC 21153 PCI Bridge\n");
3203 else 3203 else
3204 printk("unknown bridge %04x.%04x\n", 3204 printk("unknown bridge %04x.%04x\n",
3205 qpdev->vendor, qpdev->device); 3205 qpdev->vendor, qpdev->device);
3206 } 3206 }
3207 3207