diff options
Diffstat (limited to 'linux/include/media/saa7146.h')
| -rw-r--r-- | linux/include/media/saa7146.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/linux/include/media/saa7146.h b/linux/include/media/saa7146.h index e4a7aa2aa..daed75624 100644 --- a/linux/include/media/saa7146.h +++ b/linux/include/media/saa7146.h @@ -12,9 +12,7 @@ #include <asm/io.h> /* for accessing devices */ #include <linux/stringify.h> #include "compat.h" -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> -#endif #include <linux/scatterlist.h> #include <linux/vmalloc.h> /* for vmalloc() */ @@ -27,23 +25,14 @@ extern unsigned int saa7146_debug; -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) -//#define DEBUG_PROLOG printk("(0x%08x)(0x%08x) %s: %s(): ",(dev==0?-1:(dev->mem==0?-1:saa7146_read(dev,RPS_ADDR0))),(dev==0?-1:(dev->mem==0?-1:saa7146_read(dev,IER))),__stringify(KBUILD_MODNAME),__FUNCTION__) -#else //#define DEBUG_PROLOG printk("(0x%08x)(0x%08x) %s: %s(): ",(dev==0?-1:(dev->mem==0?-1:saa7146_read(dev,RPS_ADDR0))),(dev==0?-1:(dev->mem==0?-1:saa7146_read(dev,IER))),KBUILD_MODNAME,__FUNCTION__) -#endif #ifndef DEBUG_VARIABLE #define DEBUG_VARIABLE saa7146_debug #endif -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) -#define DEBUG_PROLOG printk("%s: %s(): ",__stringify(KBUILD_MODNAME),__FUNCTION__) -#define INFO(x) { printk("%s: ",__stringify(KBUILD_MODNAME)); printk x; } -#else #define DEBUG_PROLOG printk("%s: %s(): ",KBUILD_MODNAME,__FUNCTION__) #define INFO(x) { printk("%s: ",KBUILD_MODNAME); printk x; } -#endif #define ERR(x) { DEBUG_PROLOG; printk x; } @@ -124,11 +113,7 @@ struct saa7146_dev /* different device locks */ spinlock_t slock; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) struct mutex lock; -#else - struct semaphore lock; -#endif unsigned char __iomem *mem; /* pointer to mapped IO memory */ u32 revision; /* chip revision; needed for bug-workarounds*/ @@ -149,11 +134,7 @@ struct saa7146_dev void (*vv_callback)(struct saa7146_dev *dev, unsigned long status); /* i2c-stuff */ -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) struct mutex i2c_lock; -#else - struct semaphore i2c_lock; -#endif u32 i2c_bitrate; struct saa7146_dma d_i2c; /* pointer to i2c memory */ @@ -170,11 +151,7 @@ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c /* from saa7146_core.c */ extern struct list_head saa7146_devices; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) extern struct mutex saa7146_devices_lock; -#else -extern struct semaphore saa7146_devices_lock; -#endif int saa7146_register_extension(struct saa7146_extension*); int saa7146_unregister_extension(struct saa7146_extension*); struct saa7146_format* format_by_fourcc(struct saa7146_dev *dev, int fourcc); |