3 files changed, 6 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c
index 47772322b..5d1b83107 100644
--- a/linux/drivers/media/video/cx88/cx88-blackbird.c
+++ b/linux/drivers/media/video/cx88/cx88-blackbird.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-blackbird.c,v 1.3 2004/07/30 15:26:01 kraxel Exp $
+ * $Id: cx88-blackbird.c,v 1.4 2004/08/23 10:38:54 kraxel Exp $
  *
  *  Support for a cx23416 mpeg encoder via cx2388x host port.
  *  "blackbird" reference design.
@@ -26,9 +26,9 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/device.h>
 #include <linux/fs.h>
 #include <linux/delay.h>
+#include <linux/device.h>
 #include <linux/firmware.h>
 
 #include "cx88.h"
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index 9bca7ea75..8098d9ad3 100644
--- a/linux/drivers/media/video/cx88/cx88-cards.c
+++ b/linux/drivers/media/video/cx88/cx88-cards.c
@@ -148,6 +148,7 @@ struct cx88_board cx88_boards[] = {
 	[CX88_BOARD_AVERTV_303] = {
 		.name           = "AverTV Studio 303 (M126)",
 		.tuner_type     = TUNER_PHILIPS_PAL_DK,
+		.tda9887_conf   = TDA9887_PRESENT,
 		.input          = {{
 			.type   = CX88_VMUX_TELEVISION,
 			.vmux   = 0,
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index 3502d378a..aa32b1e4b 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/drivers/media/video/cx88/cx88.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88.h,v 1.23 2004/07/30 13:43:39 kraxel Exp $
+ * $Id: cx88.h,v 1.24 2004/08/23 10:38:54 kraxel Exp $
  *
  * v4l2 device driver for cx2388x based TV cards
  *
@@ -344,8 +344,8 @@ struct cx8802_dev {
 /* ----------------------------------------------------------- */
 
 #define cx_read(reg)             readl(core->lmmio + ((reg)>>2))
-#define cx_write(reg,value)      writel((value), core->lmmio + ((reg)>>2));
-#define cx_writeb(reg,value)     writeb((value), core->bmmio + (reg));
+#define cx_write(reg,value)      writel((value), core->lmmio + ((reg)>>2))
+#define cx_writeb(reg,value)     writeb((value), core->bmmio + (reg))
 
 #define cx_andor(reg,mask,value) \
   writel((readl(core->lmmio+((reg)>>2)) & ~(mask)) |\