diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-23 00:13:30 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-23 00:13:30 +0100 |
| commit | fdbc4f16f905bdbd39641f297b2b63cde17f17a5 (patch) | |
| tree | c66890977b8fdc7c32b1835aec5738d75fef6300 /linux/drivers/media/video/saa7134 | |
| parent | d943b4b0eb3bbe6f09dae652337547b5c6156371 (diff) | |
| parent | f4421c541bfe09f509ce9bc274bf7b4c22977372 (diff) | |
| download | mediapointer-dvb-s2-fdbc4f16f905bdbd39641f297b2b63cde17f17a5.tar.gz mediapointer-dvb-s2-fdbc4f16f905bdbd39641f297b2b63cde17f17a5.tar.bz2 | |
Merge from master.
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -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, |