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/fc4/soc.c | |
| 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/fc4/soc.c')
| -rw-r--r-- | drivers/fc4/soc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/fc4/soc.c b/drivers/fc4/soc.c index ec1f94738c59..cf8768b8d1f1 100644 --- a/drivers/fc4/soc.c +++ b/drivers/fc4/soc.c | |||
| @@ -643,7 +643,7 @@ static inline void soc_init(struct sbus_dev *sdev, int no) | |||
| 643 | return; | 643 | return; |
| 644 | } | 644 | } |
| 645 | 645 | ||
| 646 | SOD(("SOC uses IRQ%s\n", __irq_itoa(irq))) | 646 | SOD(("SOC uses IRQ %d\n", irq)) |
| 647 | 647 | ||
| 648 | s->port[0].fc.irq = irq; | 648 | s->port[0].fc.irq = irq; |
| 649 | s->port[1].fc.irq = irq; | 649 | s->port[1].fc.irq = irq; |