diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-09 18:48:04 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-09 18:48:04 -0300 |
| commit | 04f6a576c701b57b6e63d7d896d1910f2358ca9d (patch) | |
| tree | 3d90e2e0ea00935c815418e21788ce52140e3236 /linux/drivers/media/video/meye.h | |
| parent | e27be77e53c76ea18b468ed9c3eab9460c23e53e (diff) | |
| download | mediapointer-dvb-s2-04f6a576c701b57b6e63d7d896d1910f2358ca9d.tar.gz mediapointer-dvb-s2-04f6a576c701b57b6e63d7d896d1910f2358ca9d.tar.bz2 | |
Make new drivers compile with older kernels
From: Trent Piepho <xyzzy@speakeasy.org>
Lots of drivers wouldn't compile with kernels < 2.6.16 because of the
semaphore -> mutex rename. Also a small i2c bit for kernels < 2.6.13.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/meye.h')
| -rw-r--r-- | linux/drivers/media/video/meye.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/drivers/media/video/meye.h b/linux/drivers/media/video/meye.h index 0d09a0e38..afd1aace1 100644 --- a/linux/drivers/media/video/meye.h +++ b/linux/drivers/media/video/meye.h @@ -260,7 +260,9 @@ /* private API definitions */ #include <linux/meye.h> +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> +#endif /* Enable jpg software correction */ @@ -303,7 +305,11 @@ struct meye { /* list of buffers */ struct meye_grab_buffer grab_buffer[MEYE_MAX_BUFNBRS]; int vma_use_count[MEYE_MAX_BUFNBRS]; /* mmap count */ +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) struct mutex lock; /* mutex for open/mmap... */ +#else + struct semaphore lock; /* mutex for open/mmap... */ +#endif struct kfifo *grabq; /* queue for buffers to be grabbed */ spinlock_t grabq_lock; /* lock protecting the queue */ struct kfifo *doneq; /* queue for grabbed buffers */ |