diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-08 01:17:00 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-08 01:17:00 +0200 |
| commit | 1e35850ac2509c324478d38091880e60ab28795f (patch) | |
| tree | ffb89f595c6bcea9189a5f090fad092c8aa7428e /linux/drivers/media/video/cx88/cx88-video.c | |
| parent | 7ce87336c2f386ab6c35e985a5832d21b5cd7fab (diff) | |
| download | mediapointer-dvb-s2-1e35850ac2509c324478d38091880e60ab28795f.tar.gz mediapointer-dvb-s2-1e35850ac2509c324478d38091880e60ab28795f.tar.bz2 | |
v4l-dvb: remove support for kernels < 2.6.10
From: Hans Verkuil <hverkuil@xs4all.nl>
Phase 2 removes support for kernels < 2.6.10.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-video.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 786800e1a..fe58a1f14 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -56,16 +56,9 @@ static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; -#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 MODULE_PARM_DESC(video_nr,"video device numbers"); MODULE_PARM_DESC(vbi_nr,"vbi device numbers"); @@ -2290,11 +2283,7 @@ static int cx8800_suspend(struct pci_dev *pci_dev, pm_message_t state) cx88_shutdown(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, pci_choose_state(pci_dev, state))) { pci_disable_device(pci_dev); dev->state.disabled = 1; @@ -2326,11 +2315,7 @@ static int cx8800_resume(struct pci_dev *pci_dev) return err; } -#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 */ |