diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 20:39:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 20:39:28 -0400 |
commit | be883da7594b0a2a02074e683673ae0e522566a4 (patch) | |
tree | b62f2a8a069fb4d389935c0b2de9bc78798f50c2 /drivers/net | |
parent | 077e98945db7e54a9865b5f29a1f02f531eca414 (diff) | |
parent | 4c5eb38af2131d867842cdd09fa83a3ed77bfd26 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Update defconfig.
[SPARC64]: Don't double-export synchronize_irq.
[SPARC64]: Move over to GENERIC_HARDIRQS.
[SPARC64]: Virtualize IRQ numbers.
[SPARC64]: Kill ino_bucket->pil
[SPARC]: Kill __irq_itoa().
[SPARC64]: bp->pil can never be zero
[SPARC64]: Send all device interrupts via one PIL.
[SPARC]: Fix iommu_flush_iotlb end address
[SPARC]: Mark smp init functions as cpuinit
[SPARC]: Add missing rw can_lock macros
[SPARC]: Setup cpu_possible_map
[SPARC]: Add topology_init()
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/3c59x.c | 5 | ||||
-rw-r--r-- | drivers/net/acenic.c | 6 | ||||
-rw-r--r-- | drivers/net/sunhme.c | 5 | ||||
-rw-r--r-- | drivers/net/sunlance.c | 2 |
4 files changed, 2 insertions, 16 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index 274b0138d442..e27778926eba 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
@@ -1382,17 +1382,12 @@ static int __devinit vortex_probe1(struct device *gendev, | |||
1382 | for (i = 0; i < 6; i++) | 1382 | for (i = 0; i < 6; i++) |
1383 | iowrite8(dev->dev_addr[i], ioaddr + i); | 1383 | iowrite8(dev->dev_addr[i], ioaddr + i); |
1384 | 1384 | ||
1385 | #ifdef __sparc__ | ||
1386 | if (print_info) | ||
1387 | printk(", IRQ %s\n", __irq_itoa(dev->irq)); | ||
1388 | #else | ||
1389 | if (print_info) | 1385 | if (print_info) |
1390 | printk(", IRQ %d\n", dev->irq); | 1386 | printk(", IRQ %d\n", dev->irq); |
1391 | /* Tell them about an invalid IRQ. */ | 1387 | /* Tell them about an invalid IRQ. */ |
1392 | if (dev->irq <= 0 || dev->irq >= NR_IRQS) | 1388 | if (dev->irq <= 0 || dev->irq >= NR_IRQS) |
1393 | printk(KERN_WARNING " *** Warning: IRQ %d is unlikely to work! ***\n", | 1389 | printk(KERN_WARNING " *** Warning: IRQ %d is unlikely to work! ***\n", |
1394 | dev->irq); | 1390 | dev->irq); |
1395 | #endif | ||
1396 | 1391 | ||
1397 | EL3WINDOW(4); | 1392 | EL3WINDOW(4); |
1398 | step = (ioread8(ioaddr + Wn4_NetDiag) & 0x1e) >> 1; | 1393 | step = (ioread8(ioaddr + Wn4_NetDiag) & 0x1e) >> 1; |
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index b508812e97ac..23ff22ba5d31 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c | |||
@@ -579,11 +579,7 @@ static int __devinit acenic_probe_one(struct pci_dev *pdev, | |||
579 | } | 579 | } |
580 | 580 | ||
581 | printk("Gigabit Ethernet at 0x%08lx, ", dev->base_addr); | 581 | printk("Gigabit Ethernet at 0x%08lx, ", dev->base_addr); |
582 | #ifdef __sparc__ | 582 | printk("irq %d\n", pdev->irq); |
583 | printk("irq %s\n", __irq_itoa(pdev->irq)); | ||
584 | #else | ||
585 | printk("irq %i\n", pdev->irq); | ||
586 | #endif | ||
587 | 583 | ||
588 | #ifdef CONFIG_ACENIC_OMIT_TIGON_I | 584 | #ifdef CONFIG_ACENIC_OMIT_TIGON_I |
589 | if ((readl(&ap->regs->HostCtrl) >> 28) == 4) { | 585 | if ((readl(&ap->regs->HostCtrl) >> 28) == 4) { |
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 9f046cae2f71..bd5d2668a362 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
@@ -2221,13 +2221,8 @@ static int happy_meal_open(struct net_device *dev) | |||
2221 | if (request_irq(dev->irq, &happy_meal_interrupt, | 2221 | if (request_irq(dev->irq, &happy_meal_interrupt, |
2222 | SA_SHIRQ, dev->name, (void *)dev)) { | 2222 | SA_SHIRQ, dev->name, (void *)dev)) { |
2223 | HMD(("EAGAIN\n")); | 2223 | HMD(("EAGAIN\n")); |
2224 | #ifdef __sparc__ | ||
2225 | printk(KERN_ERR "happy_meal(SBUS): Can't order irq %s to go.\n", | ||
2226 | __irq_itoa(dev->irq)); | ||
2227 | #else | ||
2228 | printk(KERN_ERR "happy_meal(SBUS): Can't order irq %d to go.\n", | 2224 | printk(KERN_ERR "happy_meal(SBUS): Can't order irq %d to go.\n", |
2229 | dev->irq); | 2225 | dev->irq); |
2230 | #endif | ||
2231 | 2226 | ||
2232 | return -EAGAIN; | 2227 | return -EAGAIN; |
2233 | } | 2228 | } |
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index b7d87d4690b4..6381243d8d00 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
@@ -936,7 +936,7 @@ static int lance_open(struct net_device *dev) | |||
936 | 936 | ||
937 | if (request_irq(dev->irq, &lance_interrupt, SA_SHIRQ, | 937 | if (request_irq(dev->irq, &lance_interrupt, SA_SHIRQ, |
938 | lancestr, (void *) dev)) { | 938 | lancestr, (void *) dev)) { |
939 | printk(KERN_ERR "Lance: Can't get irq %s\n", __irq_itoa(dev->irq)); | 939 | printk(KERN_ERR "Lance: Can't get irq %d\n", dev->irq); |
940 | return -EAGAIN; | 940 | return -EAGAIN; |
941 | } | 941 | } |
942 | 942 | ||