summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2006-01-06 19:19:12 +0000
committerMauro Carvalho Chehab <devnull@localhost>2006-01-06 19:19:12 +0000
commitdf494baee07b4aa44ff5f8791cd4b972e3c7c8c3 (patch)
treebe4d89fa7e12b9b167d0e52bab3449ada58104be
parentf987d5c10765573cc585947390dc8f42706b0d0f (diff)
downloadmediapointer-dvb-s2-df494baee07b4aa44ff5f8791cd4b972e3c7c8c3.tar.gz
mediapointer-dvb-s2-df494baee07b4aa44ff5f8791cd4b972e3c7c8c3.tar.bz2
Latest patch #ifs were wrong. fixing.
kernel-sync. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat
-rw-r--r--linux/drivers/media/dvb/b2c2/flexcop-usb.c2
-rw-r--r--linux/drivers/media/dvb/cinergyT2/cinergyT2.c2
-rw-r--r--linux/drivers/media/dvb/dvb-usb/a800.c2
-rw-r--r--linux/drivers/media/dvb/dvb-usb/cxusb.c2
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dibusb-mb.c2
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dibusb-mc.c2
-rw-r--r--linux/drivers/media/dvb/dvb-usb/digitv.c2
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dtt200u.c2
-rw-r--r--linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c2
-rw-r--r--linux/drivers/media/dvb/dvb-usb/umt-010.c2
-rw-r--r--linux/drivers/media/dvb/dvb-usb/vp702x.c2
-rw-r--r--linux/drivers/media/dvb/dvb-usb/vp7045.c2
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-video.c2
-rw-r--r--v4l/ChangeLog20
14 files changed, 34 insertions, 12 deletions
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-usb.c b/linux/drivers/media/dvb/b2c2/flexcop-usb.c
index b5a590115..78e0adf0f 100644
--- a/linux/drivers/media/dvb/b2c2/flexcop-usb.c
+++ b/linux/drivers/media/dvb/b2c2/flexcop-usb.c
@@ -544,7 +544,9 @@ static struct usb_device_id flexcop_usb_table [] = {
/* usb specific object needed to register this driver with the usb subsystem */
static struct usb_driver flexcop_usb_driver = {
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
+#endif
.name = "b2c2_flexcop_usb",
.probe = flexcop_usb_probe,
.disconnect = flexcop_usb_disconnect,
diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
index bb6f75ef6..47b21f54d 100644
--- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -1020,7 +1020,7 @@ static const struct usb_device_id cinergyt2_table [] __devinitdata = {
MODULE_DEVICE_TABLE(usb, cinergyt2_table);
static struct usb_driver cinergyt2_driver = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
#endif
.name = "cinergyT2",
diff --git a/linux/drivers/media/dvb/dvb-usb/a800.c b/linux/drivers/media/dvb/dvb-usb/a800.c
index 23d9801ba..cb338ed20 100644
--- a/linux/drivers/media/dvb/dvb-usb/a800.c
+++ b/linux/drivers/media/dvb/dvb-usb/a800.c
@@ -144,7 +144,7 @@ static struct dvb_usb_properties a800_properties = {
};
static struct usb_driver a800_driver = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
#endif
.name = "dvb_usb_a800",
diff --git a/linux/drivers/media/dvb/dvb-usb/cxusb.c b/linux/drivers/media/dvb/dvb-usb/cxusb.c
index dca5c2f9b..1c4f07219 100644
--- a/linux/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/linux/drivers/media/dvb/dvb-usb/cxusb.c
@@ -319,7 +319,7 @@ static struct dvb_usb_properties cxusb_bluebird_lgh064f_properties = {
};
static struct usb_driver cxusb_driver = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
#endif
.name = "dvb_usb_cxusb",
diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c b/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c
index 621bf5a3d..f137f27f2 100644
--- a/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -373,7 +373,7 @@ static struct dvb_usb_properties artec_t1_usb2_properties = {
};
static struct usb_driver dibusb_driver = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
#endif
.name = "dvb_usb_dibusb_mb",
diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c b/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c
index 874a3c97b..87fc1de1f 100644
--- a/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c
+++ b/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -82,7 +82,7 @@ static struct dvb_usb_properties dibusb_mc_properties = {
};
static struct usb_driver dibusb_mc_driver = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
#endif
.name = "dvb_usb_dibusb_mc",
diff --git a/linux/drivers/media/dvb/dvb-usb/digitv.c b/linux/drivers/media/dvb/dvb-usb/digitv.c
index 81defb314..38639b3c8 100644
--- a/linux/drivers/media/dvb/dvb-usb/digitv.c
+++ b/linux/drivers/media/dvb/dvb-usb/digitv.c
@@ -233,7 +233,7 @@ static struct dvb_usb_properties digitv_properties = {
};
static struct usb_driver digitv_driver = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
#endif
.name = "dvb_usb_digitv",
diff --git a/linux/drivers/media/dvb/dvb-usb/dtt200u.c b/linux/drivers/media/dvb/dvb-usb/dtt200u.c
index 089c25a4b..d2ce5d52a 100644
--- a/linux/drivers/media/dvb/dvb-usb/dtt200u.c
+++ b/linux/drivers/media/dvb/dvb-usb/dtt200u.c
@@ -198,7 +198,7 @@ static struct dvb_usb_properties wt220u_properties = {
/* usb specific object needed to register this driver with the usb subsystem */
static struct usb_driver dtt200u_usb_driver = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
#endif
.name = "dvb_usb_dtt200u",
diff --git a/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c
index e8bc05db1..07654c2ef 100644
--- a/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c
+++ b/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c
@@ -202,7 +202,7 @@ static struct dvb_usb_properties nova_t_properties = {
};
static struct usb_driver nova_t_driver = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
#endif
.name = "dvb_usb_nova_t_usb2",
diff --git a/linux/drivers/media/dvb/dvb-usb/umt-010.c b/linux/drivers/media/dvb/dvb-usb/umt-010.c
index f5f24a777..8eeaa3db3 100644
--- a/linux/drivers/media/dvb/dvb-usb/umt-010.c
+++ b/linux/drivers/media/dvb/dvb-usb/umt-010.c
@@ -128,7 +128,7 @@ static struct dvb_usb_properties umt_properties = {
};
static struct usb_driver umt_driver = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
#endif
.name = "dvb_usb_umt_010",
diff --git a/linux/drivers/media/dvb/dvb-usb/vp702x.c b/linux/drivers/media/dvb/dvb-usb/vp702x.c
index 1578513b2..88ba773cc 100644
--- a/linux/drivers/media/dvb/dvb-usb/vp702x.c
+++ b/linux/drivers/media/dvb/dvb-usb/vp702x.c
@@ -256,7 +256,7 @@ static struct dvb_usb_properties vp702x_properties = {
/* usb specific object needed to register this driver with the usb subsystem */
static struct usb_driver vp702x_usb_driver = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
#endif
.name = "dvb-usb-vp702x",
diff --git a/linux/drivers/media/dvb/dvb-usb/vp7045.c b/linux/drivers/media/dvb/dvb-usb/vp7045.c
index 70c8f2503..812d4d5fb 100644
--- a/linux/drivers/media/dvb/dvb-usb/vp7045.c
+++ b/linux/drivers/media/dvb/dvb-usb/vp7045.c
@@ -253,7 +253,7 @@ static struct dvb_usb_properties vp7045_properties = {
/* usb specific object needed to register this driver with the usb subsystem */
static struct usb_driver vp7045_usb_driver = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
#endif
.name = "dvb_usb_vp7045",
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c
index 936e323ef..0e5489575 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -2164,7 +2164,7 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
}
static struct usb_driver em28xx_usb_driver = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
#endif
.name = "em28xx",
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index a8675c386..be170b42d 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,23 @@
+2006-01-06 19:17 mchehab
+
+ * linux/drivers/media/dvb/b2c2/flexcop-usb.c:
+ * linux/drivers/media/dvb/cinergyT2/cinergyT2.c:
+ * linux/drivers/media/dvb/dvb-usb/a800.c:
+ * linux/drivers/media/dvb/dvb-usb/cxusb.c:
+ * linux/drivers/media/dvb/dvb-usb/dibusb-mb.c:
+ * linux/drivers/media/dvb/dvb-usb/dibusb-mc.c:
+ * linux/drivers/media/dvb/dvb-usb/digitv.c:
+ * linux/drivers/media/dvb/dvb-usb/dtt200u.c:
+ * linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c:
+ * linux/drivers/media/dvb/dvb-usb/umt-010.c:
+ * linux/drivers/media/dvb/dvb-usb/vp702x.c:
+ * linux/drivers/media/dvb/dvb-usb/vp7045.c:
+ * linux/drivers/media/video/em28xx/em28xx-video.c:
+ - Latest patch #ifs were wrong. fixing.
+ - kernel-sync.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2006-01-06 18:51 mchehab
* linux/drivers/media/dvb/cinergyT2/cinergyT2.c:
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 21:24:58 +0000