diff options
| author | Igor Mammedov <niallain@gmail.com> | 2008-04-28 19:08:21 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 19:08:21 -0400 |
| commit | e9f20d6f03e8df393b001dab6dc5226c2a5daf57 (patch) | |
| tree | 73e94fa5e4f83576c97e36187b809c5aad2ade30 /drivers/video/cg6.c | |
| parent | bf62fd887cab230f5952b611bde25e8e15acb454 (diff) | |
| parent | e31a94ed371c70855eb30b77c490d6d85dd4da26 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/cg6.c')
| -rw-r--r-- | drivers/video/cg6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 549891d76ef5..fc90db6da65a 100644 --- a/drivers/video/cg6.c +++ b/drivers/video/cg6.c | |||
| @@ -781,7 +781,7 @@ static int __devinit cg6_probe(struct of_device *op, | |||
| 781 | 781 | ||
| 782 | dev_set_drvdata(&op->dev, info); | 782 | dev_set_drvdata(&op->dev, info); |
| 783 | 783 | ||
| 784 | printk("%s: CGsix [%s] at %lx:%lx\n", | 784 | printk(KERN_INFO "%s: CGsix [%s] at %lx:%lx\n", |
| 785 | dp->full_name, info->fix.id, | 785 | dp->full_name, info->fix.id, |
| 786 | par->which_io, par->physbase); | 786 | par->which_io, par->physbase); |
| 787 | 787 | ||