diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-20 12:57:39 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-20 12:57:39 -0300 |
| commit | 2e9f5b4d99ccd25631f71d034960abb4c024d5a5 (patch) | |
| tree | f9ae389af1c7290206521381d4d190232bb9a779 /linux | |
| parent | ba6335c0bee940630c05f4e22276b03ed7217b33 (diff) | |
| parent | d4d6f90d82150e74c1d11b906aa3a9c2239ee660 (diff) | |
| download | mediapointer-dvb-s2-2e9f5b4d99ccd25631f71d034960abb4c024d5a5.tar.gz mediapointer-dvb-s2-2e9f5b4d99ccd25631f71d034960abb4c024d5a5.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/radio/radio-gemtek-pci.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/meye.c | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/linux/drivers/media/radio/radio-gemtek-pci.c b/linux/drivers/media/radio/radio-gemtek-pci.c index 02242f1b3..dd050d4f1 100644 --- a/linux/drivers/media/radio/radio-gemtek-pci.c +++ b/linux/drivers/media/radio/radio-gemtek-pci.c @@ -95,7 +95,6 @@ struct gemtek_pci_card { u32 iobase; u32 length; - u16 model; u32 current_frequency; u8 mute; @@ -414,8 +413,6 @@ static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci goto err_pci; } - pci_read_config_word( pci_dev, PCI_SUBSYSTEM_ID, &card->model ); - pci_set_drvdata( pci_dev, card ); if ( (devradio = kmalloc( sizeof( struct video_device ), GFP_KERNEL )) == NULL ) { @@ -437,8 +434,9 @@ static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci printk( KERN_INFO "Gemtek PCI Radio (rev. %d) found at 0x%04x-0x%04x.\n", pci_dev->revision, card->iobase, card->iobase + card->length - 1 ); #else - printk( KERN_INFO "Gemtek PCI Radio found at 0x%04x-0x%04x.\n", - card->iobase, card->iobase + card->length - 1 ); + printk( KERN_INFO "Gemtek PCI Radio (rev. %d) found at 0x%04x-0x%04x.\n", + v4l_compat_pci_rev(pci_dev), card->iobase, + card->iobase + card->length - 1 ); #endif return 0; diff --git a/linux/drivers/media/video/meye.c b/linux/drivers/media/video/meye.c index be29d0483..035000a14 100644 --- a/linux/drivers/media/video/meye.c +++ b/linux/drivers/media/video/meye.c @@ -1945,8 +1945,8 @@ static int __devinit meye_probe(struct pci_dev *pcidev, printk(KERN_INFO "meye: mchip KL5A72002 rev. %d, base %lx, irq %d\n", meye.mchip_dev->revision, mchip_adr, meye.mchip_irq); #else - printk(KERN_INFO "meye: mchip KL5A72002, base %lx, irq %d\n", - mchip_adr, meye.mchip_irq); + printk(KERN_INFO "meye: mchip KL5A72002 rev. %d, base %lx, irq %d\n", + v4l_compat_pci_rev(meye.mchip_dev), mchip_adr, meye.mchip_irq); #endif return 0; |