diff options
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-mpeg.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index 7b45b5d8a..d2e9767e8 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-mpeg.c,v 1.13 2004/10/19 16:02:04 kraxel Exp $ + * $Id: cx88-mpeg.c,v 1.14 2004/10/25 11:26:36 kraxel Exp $ * * Support for the mpeg transport stream transfers * PCI function #2 of the cx2388x. @@ -412,7 +412,11 @@ int cx8802_suspend_common(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; @@ -430,7 +434,11 @@ int cx8802_resume_common(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 */ |