diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /drivers/net/acenic.c | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'drivers/net/acenic.c')
| -rw-r--r-- | drivers/net/acenic.c | 6 |
1 files changed, 1 insertions, 5 deletions
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) { |