The patch number 8641 was added via Hans Verkuil <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Hans Verkuil <[EMAIL PROTECTED]>
arv: fix compilation errors/warnings
- add PCI dependency for btcx
- fix compile errors (doesn't like ';' at the end of a #if 0)
Priority: normal
Signed-off-by: Hans Verkuil <[EMAIL PROTECTED]>
---
linux/drivers/media/video/Kconfig | 1 +
linux/drivers/media/video/arv.c | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff -r 251408a0666a -r deeb5dfb37a1 linux/drivers/media/video/Kconfig
--- a/linux/drivers/media/video/Kconfig Fri Aug 08 18:27:16 2008 +0200
+++ b/linux/drivers/media/video/Kconfig Fri Aug 08 20:47:07 2008 +0200
@@ -34,6 +34,7 @@ config VIDEOBUF_DVB
select VIDEOBUF_GEN
config VIDEO_BTCX
+ depends on PCI
tristate
config VIDEO_IR
diff -r 251408a0666a -r deeb5dfb37a1 linux/drivers/media/video/arv.c
--- a/linux/drivers/media/video/arv.c Fri Aug 08 18:27:16 2008 +0200
+++ b/linux/drivers/media/video/arv.c Fri Aug 08 20:47:07 2008 +0200
@@ -39,7 +39,7 @@
#include <asm/dma.h>
#include <asm/byteorder.h>
-#if 0 /* keep */;
+#if 0 /* keep */
#define DEBUG(n, args...) printk(args)
#define CHECK_LOST 1
#else
@@ -579,11 +579,11 @@ static void ar_interrupt(int irq, void *
* we have to start capture.
*/
disable_dma();
-#if 0 /* keep */;
+#if 0 /* keep */
ar_outl(ar->line_buff, M32R_DMA0CDA_PORTL); /* needless? */
#endif
memcpy(ar->frame[0], ar->line_buff, ar->line_bytes);
-#if 0 /* keep */;
+#if 0 /* keep */
ar_outl(0xa1861300, M32R_DMA0CR0_PORTL);
#endif
enable_dma();
@@ -609,7 +609,7 @@ static void ar_interrupt(int irq, void *
ar_outl(arvcr1, ARVCR1); /* disable */
wake_up_interruptible(&ar->wait);
} else {
-#if 0 /* keep */;
+#if 0 /* keep */
ar_outl(ar->line_buff, M32R_DMA0CDA_PORTL);
ar_outl(0xa1861300, M32R_DMA0CR0_PORTL);
#endif
@@ -693,7 +693,7 @@ static int ar_initialize(struct video_de
printk(".");
iic(2,0x78,0x8e,0x0c,0x00);
iic(2,0x78,0x8f,0x00,0x00);
-#if 0 /* keep */;
+#if 0 /* keep */
iic(2,0x78,0x90,0x00,0x00); /* AWB on=1 off=0 */
#endif
iic(2,0x78,0x93,0x01,0x00);
@@ -712,7 +712,7 @@ static int ar_initialize(struct video_de
iic(2,0x78,0x9e,0x2e,0x00);
iic(2,0x78,0xb8,0x78,0x00);
iic(2,0x78,0xba,0x05,0x00);
-#if 0 /* keep */;
+#if 0 /* keep */
iic(2,0x78,0x83,0x8c,0x00); /* brightness */
#endif
printk(".");
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/deeb5dfb37a177eebbb247f21c55fcc170fa210b
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
