diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-17 03:05:02 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-17 03:05:02 -0500 |
| commit | a2bfbc072e279ff81e6b336acff612b9bc2e5281 (patch) | |
| tree | 89cfe21911e1539e1b7f89d8a10d42abecba2a18 /drivers/net/r6040.c | |
| parent | 5c427ff9e4cc61625d48172ea082ae99e21eea6a (diff) | |
| parent | 82b3cc1a2f5e46300a9dec4a8cc8106dc20a4c23 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/can/Kconfig
Diffstat (limited to 'drivers/net/r6040.c')
| -rw-r--r-- | drivers/net/r6040.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 7dfcb58b0eb4..8b14c6eda7c3 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c | |||
| @@ -1085,7 +1085,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, | |||
| 1085 | int bar = 0; | 1085 | int bar = 0; |
| 1086 | u16 *adrp; | 1086 | u16 *adrp; |
| 1087 | 1087 | ||
| 1088 | printk(KERN_INFO "%s\n", version); | 1088 | printk("%s\n", version); |
| 1089 | 1089 | ||
| 1090 | err = pci_enable_device(pdev); | 1090 | err = pci_enable_device(pdev); |
| 1091 | if (err) | 1091 | if (err) |