diff options
Diffstat (limited to 'linux/drivers/media/common')
-rw-r--r-- | linux/drivers/media/common/ir-functions.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/common/tuners/tda18271-priv.h | 8 | ||||
-rw-r--r-- | linux/drivers/media/common/tuners/tuner-xc2028.c | 8 |
3 files changed, 0 insertions, 20 deletions
diff --git a/linux/drivers/media/common/ir-functions.c b/linux/drivers/media/common/ir-functions.c index 2adbb6e9f..3653b6d37 100644 --- a/linux/drivers/media/common/ir-functions.c +++ b/linux/drivers/media/common/ir-functions.c @@ -67,10 +67,6 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir, if (ir_codes) memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes)); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) - init_input_dev(dev); -#endif - dev->keycode = ir->ir_codes; dev->keycodesize = sizeof(IR_KEYTAB_TYPE); dev->keycodemax = IR_KEYTAB_SIZE; diff --git a/linux/drivers/media/common/tuners/tda18271-priv.h b/linux/drivers/media/common/tuners/tda18271-priv.h index 2ed61a31f..78417b7c1 100644 --- a/linux/drivers/media/common/tuners/tda18271-priv.h +++ b/linux/drivers/media/common/tuners/tda18271-priv.h @@ -24,11 +24,7 @@ #include <linux/kernel.h> #include <linux/types.h> #include "compat.h" -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) #include <linux/mutex.h> -#else -#include <asm/semaphore.h> -#endif #include "tuner-i2c.h" #include "tda18271.h" @@ -127,11 +123,7 @@ struct tda18271_priv { struct tda18271_std_map std; struct tda18271_rf_tracking_filter_cal rf_cal_state[8]; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) struct mutex lock; -#else - struct semaphore lock; -#endif u32 frequency; u32 bandwidth; diff --git a/linux/drivers/media/common/tuners/tuner-xc2028.c b/linux/drivers/media/common/tuners/tuner-xc2028.c index 9d3f397e3..88fd2c91c 100644 --- a/linux/drivers/media/common/tuners/tuner-xc2028.c +++ b/linux/drivers/media/common/tuners/tuner-xc2028.c @@ -14,11 +14,7 @@ #include <linux/videodev2.h> #include <linux/delay.h> #include <media/tuner.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16) #include <linux/mutex.h> -#else -#include <asm/semaphore.h> -#endif #include "compat.h" #include <asm/unaligned.h> #include "tuner-i2c.h" @@ -95,11 +91,7 @@ struct xc2028_data { struct firmware_properties cur_fw; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16) struct mutex lock; -#else - struct semaphore lock; -#endif }; #define i2c_send(priv, buf, size) ({ \ |