diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-20 13:06:30 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-20 13:06:30 -0300 |
| commit | 14800f3d31adb104e766f47d5c0e9fa2f8404293 (patch) | |
| tree | 1b8e46ad632551c04b603c7c8253cc704f207a39 /linux | |
| parent | 5ba97bff5eae353cc41bae04e9041df6a7e4bc5f (diff) | |
| parent | 618193593ba85b281007ed8beace31b1112d357e (diff) | |
| download | mediapointer-dvb-s2-14800f3d31adb104e766f47d5c0e9fa2f8404293.tar.gz mediapointer-dvb-s2-14800f3d31adb104e766f47d5c0e9fa2f8404293.tar.bz2 | |
Merge from mkrufky tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index fa242c5d0..6d2aedd31 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1031,7 +1031,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, if (saa7134_no_overlay <= 0) { saa7134_video_template.type |= VID_TYPE_OVERLAY; } else { - printk("bttv: Overlay support disabled.\n"); + printk("%s: Overlay support disabled.\n",dev->name); } dev->video_dev = vdev_init(dev,&saa7134_video_template,"video"); err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER, |