diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index ceaedf352..faee9d885 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -1088,11 +1088,13 @@ void cx88_core_put(struct cx88_core *core, struct pci_dev *pci) mutex_lock(&devlist); cx88_ir_fini(core); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) if (0 == core->i2c_rc) { if (core->i2c_rtc) i2c_unregister_device(core->i2c_rtc); i2c_del_adapter(&core->i2c_adap); } +#endif list_del(&core->devlist); iounmap(core->lmmio); cx88_devcount--; diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index fdcc1c1c5..fbe69a62d 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -57,7 +57,7 @@ #else #include <linux/freezer.h> #endif -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-i2c-drv-legacy.h> |