summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/au0828
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/au0828')
-rw-r--r--linux/drivers/media/video/au0828/au0828-core.c5
-rw-r--r--linux/drivers/media/video/au0828/au0828.h8
2 files changed, 0 insertions, 13 deletions
diff --git a/linux/drivers/media/video/au0828/au0828-core.c b/linux/drivers/media/video/au0828/au0828-core.c
index 5642058ae..123422f82 100644
--- a/linux/drivers/media/video/au0828/au0828-core.c
+++ b/linux/drivers/media/video/au0828/au0828-core.c
@@ -23,9 +23,7 @@
#include <linux/videodev2.h>
#include <media/v4l2-common.h>
#include "compat.h"
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 15)
#include <linux/mutex.h>
-#endif
#include "au0828.h"
@@ -218,9 +216,6 @@ static struct usb_driver au0828_usb_driver = {
.probe = au0828_usb_probe,
.disconnect = au0828_usb_disconnect,
.id_table = au0828_usb_id_table,
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 15)
- .owner = THIS_MODULE,
-#endif
};
static int __init au0828_init(void)
diff --git a/linux/drivers/media/video/au0828/au0828.h b/linux/drivers/media/video/au0828/au0828.h
index b00d8cda5..7beb57179 100644
--- a/linux/drivers/media/video/au0828/au0828.h
+++ b/linux/drivers/media/video/au0828/au0828.h
@@ -44,11 +44,7 @@ struct au0828_board {
};
struct au0828_dvb {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 15)
struct mutex lock;
-#else
- struct semaphore lock;
-#endif
struct dvb_adapter adapter;
struct dvb_frontend *frontend;
struct dvb_demux demux;
@@ -60,11 +56,7 @@ struct au0828_dvb {
};
struct au0828_dev {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 15)
struct mutex mutex;
-#else
- struct semaphore mutex;
-#endif
struct usb_device *usbdev;
int board;
u8 ctrlmsg[64];