diff options
| author | Gerd Knorr <devnull@localhost> | 2004-10-25 11:26:35 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-10-25 11:26:35 +0000 |
| commit | 500c59b431256f91f87b8c82dfa13982d08fc780 (patch) | |
| tree | 4666be071a93b383ebda3b7bcab826d3a1b9adc6 /linux/drivers/media/video/cx88/cx88-video.c | |
| parent | a3447d4616de78c449b78904b8b5e66db92f2c58 (diff) | |
| download | mediapointer-dvb-s2-500c59b431256f91f87b8c82dfa13982d08fc780.tar.gz mediapointer-dvb-s2-500c59b431256f91f87b8c82dfa13982d08fc780.tar.bz2 | |
- new saa7134 card by Nickolay V. Shmyrev
- misc stuff
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-video.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index c1ee8baa4..933f7739d 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.43 2004/10/19 16:02:05 kraxel Exp $ + * $Id: cx88-video.c,v 1.44 2004/10/25 11:26:36 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -41,18 +41,22 @@ MODULE_LICENSE("GPL"); /* ------------------------------------------------------------------ */ static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; -static unsigned int video_nr_num; -module_param_array(video_nr,int,video_nr_num,0444); -MODULE_PARM_DESC(video_nr,"video device numbers"); +static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; +static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; -static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; -static unsigned int vbi_nr_num; -module_param_array(vbi_nr,int,vbi_nr_num,0444); -MODULE_PARM_DESC(vbi_nr,"vbi device numbers"); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) +static unsigned int dummy; +module_param_array(video_nr, int, dummy, 0444); +module_param_array(vbi_nr, int, dummy, 0444); +module_param_array(radio_nr, int, dummy, 0444); +#else +module_param_array(video_nr, int, NULL, 0444); +module_param_array(vbi_nr, int, NULL, 0444); +module_param_array(radio_nr, int, NULL, 0444); +#endif -static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; -static unsigned int radio_nr_num; -module_param_array(radio_nr,int,radio_nr_num,0444); +MODULE_PARM_DESC(video_nr,"video device numbers"); +MODULE_PARM_DESC(vbi_nr,"vbi device numbers"); MODULE_PARM_DESC(radio_nr,"radio device numbers"); static unsigned int video_debug = 0; @@ -2186,7 +2190,11 @@ static int cx8800_suspend(struct pci_dev *pci_dev, u32 state) cx88_shutdown(dev->core); #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) pci_save_state(pci_dev, dev->state.pci_cfg); +#else + pci_save_state(pci_dev); +#endif if (0 != pci_set_power_state(pci_dev, state)) { pci_disable_device(pci_dev); dev->state.disabled = 1; @@ -2204,7 +2212,11 @@ static int cx8800_resume(struct pci_dev *pci_dev) dev->state.disabled = 0; } pci_set_power_state(pci_dev, 0); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) pci_restore_state(pci_dev, dev->state.pci_cfg); +#else + pci_restore_state(pci_dev); +#endif #if 1 /* FIXME: re-initialize hardware */ |