diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /drivers/net/amd8111e.c | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/net/amd8111e.c')
| -rw-r--r-- | drivers/net/amd8111e.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index e7fdd81919b..85f7276aaba 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c @@ -1945,13 +1945,13 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev, err = pci_enable_device(pdev); if(err){ - printk(KERN_ERR "amd8111e: Cannot enable new PCI device," + printk(KERN_ERR "amd8111e: Cannot enable new PCI device, " "exiting.\n"); return err; } if(!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)){ - printk(KERN_ERR "amd8111e: Cannot find PCI base address" + printk(KERN_ERR "amd8111e: Cannot find PCI base address, " "exiting.\n"); err = -ENODEV; goto err_disable_pdev; |