diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 12:34:58 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 12:34:58 -0500 |
| commit | 9b8b317d58084b9a44f6f33b355c4278d9f841fb (patch) | |
| tree | e0df89800bf4301c4017db3cdf04a2056ec1a852 /drivers/net/r6040.c | |
| parent | 78c210efdefe07131f91ed512a3308b15bb14e2f (diff) | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
Merge commit 'v2.6.32-rc8' into HEAD
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) |