diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /drivers/net/wan/sbni.c | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'drivers/net/wan/sbni.c')
| -rw-r--r-- | drivers/net/wan/sbni.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index 545178e6765d..85c02a2ec2e7 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c | |||
| @@ -326,11 +326,9 @@ sbni_pci_probe( struct net_device *dev ) | |||
| 326 | } | 326 | } |
| 327 | 327 | ||
| 328 | if (pci_irq_line <= 0 || pci_irq_line >= nr_irqs) | 328 | if (pci_irq_line <= 0 || pci_irq_line >= nr_irqs) |
| 329 | printk( KERN_WARNING " WARNING: The PCI BIOS assigned " | 329 | printk( KERN_WARNING |
| 330 | "this PCI card to IRQ %d, which is unlikely " | 330 | " WARNING: The PCI BIOS assigned this PCI card to IRQ %d, which is unlikely to work!.\n" |
| 331 | "to work!.\n" | 331 | " You should use the PCI BIOS setup to assign a valid IRQ line.\n", |
| 332 | KERN_WARNING " You should use the PCI BIOS " | ||
| 333 | "setup to assign a valid IRQ line.\n", | ||
| 334 | pci_irq_line ); | 332 | pci_irq_line ); |
| 335 | 333 | ||
| 336 | /* avoiding re-enable dual adapters */ | 334 | /* avoiding re-enable dual adapters */ |