[kernel/f14/master] and now, really make it actually build. sigh.

[Jarod Wilson]

commit dd3abe2b99020aada77b45702d3e91a618eafb48
Author: Jarod Wilson <jarod at redhat.com>
Date:   Tue Jan 18 16:14:55 2011 -0500

    and now, really make it actually build. sigh.
    
    Signed-off-by: Jarod Wilson <jarod at redhat.com>

 linux-2.6-v4l-dvb-fixes.patch  |   20 ++++++++++++++++++++
 linux-2.6-v4l-dvb-update.patch |    2 +-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/linux-2.6-v4l-dvb-fixes.patch b/linux-2.6-v4l-dvb-fixes.patch
index a22f04a..dbd921f 100644
--- a/linux-2.6-v4l-dvb-fixes.patch
+++ b/linux-2.6-v4l-dvb-fixes.patch
@@ -3,6 +3,13 @@ Not yet upstream, willl send RSN...
 --jarod
 
 Author: Jarod Wilson <jarod at redhat.com>
+Date:   Tue Jan 18 15:31:24 2011 -0500
+
+    rc/streamzap: timeout needs to be in NS
+    
+    Signed-off-by: Jarod Wilson <jarod at redhat.com>
+
+Author: Jarod Wilson <jarod at redhat.com>
 Date:   Tue Jan 18 00:27:45 2011 -0500
 
     rc/mce: add mappings for missing keys
@@ -85,3 +92,16 @@ index 3bf3337..2f5dc06 100644
  	{ 0x800f043a, KEY_BRIGHTNESSUP },
  
  	{ 0x800f0446, KEY_TV },
+diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c
+index 6e2911c..1b013d4 100644
+--- a/drivers/media/rc/streamzap.c
++++ b/drivers/media/rc/streamzap.c
+@@ -430,7 +430,7 @@ static int __devinit streamzap_probe(struct usb_interface *intf,
+ 	sz->decoder_state = PulseSpace;
+ 	/* FIXME: don't yet have a way to set this */
+ 	sz->timeout_enabled = true;
+-	sz->rdev->timeout = (((SZ_TIMEOUT * SZ_RESOLUTION * 1000) &
++	sz->rdev->timeout = ((MS_TO_NS(SZ_TIMEOUT * SZ_RESOLUTION) &
+ 				IR_MAX_DURATION) | 0x03000000);
+ 	#if 0
+ 	/* not yet supported, depends on patches from maxim */
diff --git a/linux-2.6-v4l-dvb-update.patch b/linux-2.6-v4l-dvb-update.patch
index 364cefe..f92cc50 100644
--- a/linux-2.6-v4l-dvb-update.patch
+++ b/linux-2.6-v4l-dvb-update.patch
@@ -220009,7 +220009,7 @@ Index: linux-2.6.35.x86_64/drivers/staging/cxd2099/cxd2099.h
 +        (defined(CONFIG_DVB_CXD2099_MODULE) && defined(MODULE))
 +struct dvb_ca_en50221 *cxd2099_attach(u8 adr, void *priv, struct i2c_adapter *i2c);
 +#else
-+struct dvb_ca_en50221 *cxd2099_attach(u8 adr, void *priv, struct i2c_adapter *i2c)
++static inline struct dvb_ca_en50221 *cxd2099_attach(u8 adr, void *priv, struct i2c_adapter *i2c)
 +{
 +	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
 +	return NULL;