diff --git a/drivers/media/dvb-frontends/stv0367_priv.h b/drivers/media/dvb-frontends/stv0367_priv.h
index 617f605947b2..7f056d1cce82 100644
--- a/drivers/media/dvb-frontends/stv0367_priv.h
+++ b/drivers/media/dvb-frontends/stv0367_priv.h
@@ -25,8 +25,11 @@
 #endif
 
 /* MACRO definitions */
+#ifndef MIN
 #define MAX(X, Y) ((X) >= (Y) ? (X) : (Y))
 #define MIN(X, Y) ((X) <= (Y) ? (X) : (Y))
+#endif
+
 #define INRANGE(X, Y, Z) \
 	((((X) <= (Y)) && ((Y) <= (Z))) || \
 	(((Z) <= (Y)) && ((Y) <= (X))) ? 1 : 0)
diff --git a/drivers/media/pci/bt8xx/bttv-gpio.c b/drivers/media/pci/bt8xx/bttv-gpio.c
index 6b7fea50328c..59a6f160aac7 100644
--- a/drivers/media/pci/bt8xx/bttv-gpio.c
+++ b/drivers/media/pci/bt8xx/bttv-gpio.c
@@ -28,9 +28,9 @@
 /* ----------------------------------------------------------------------- */
 /* internal: the bttv "bus"                                                */
 
-static int bttv_sub_bus_match(struct device *dev, struct device_driver *drv)
+static int bttv_sub_bus_match(struct device *dev, const struct device_driver *drv)
 {
-	struct bttv_sub_driver *sub = to_bttv_sub_drv(drv);
+	const struct bttv_sub_driver *sub = to_bttv_sub_drv(drv);
 	int len = strlen(sub->wanted);
 
 	if (0 == strncmp(dev_name(dev), sub->wanted, len))
diff --git a/drivers/media/pci/tbsecp3/tbsecp3-cards.c b/drivers/media/pci/tbsecp3/tbsecp3-cards.c
index a160177265a6..59121092d1ec 100755
--- a/drivers/media/pci/tbsecp3/tbsecp3-cards.c
+++ b/drivers/media/pci/tbsecp3/tbsecp3-cards.c
@@ -1070,6 +1070,31 @@ struct tbsecp3_board tbsecp3_boards[] = {
 			},
 		}
 	},
+	[TBSECP3_BOARD_TBS6324] = {
+		.board_id	= TBSECP3_BOARD_TBS6324,
+		.name		= "TurboSight TBS 6324 SDI Capture ",
+		.adapters	= 4,
+		.i2c_speed	= 39,
+		.eeprom_i2c	= 1,
+		.adap_config	= {
+			{
+				.ts_in = 0,
+				.i2c_bus_nr = 3,
+			},
+			{
+				.ts_in = 1,
+				.i2c_bus_nr = 2,
+			},
+			{
+				.ts_in = 2,
+				.i2c_bus_nr = 1,
+			},
+			{
+				.ts_in = 3,
+				.i2c_bus_nr = 0,
+			},
+		}
+	},
 	[TBSECP3_BOARD_TBS690a] = {
 		.board_id	= TBSECP3_BOARD_TBS690a,
 		.name		= "TurboSight TBS 690a ASI Capture ",
diff --git a/drivers/media/pci/tbsecp3/tbsecp3-core.c b/drivers/media/pci/tbsecp3/tbsecp3-core.c
index ca9a63efe8a5..a81058be8a4f 100755
--- a/drivers/media/pci/tbsecp3/tbsecp3-core.c
+++ b/drivers/media/pci/tbsecp3/tbsecp3-core.c
@@ -399,7 +399,8 @@ static const struct pci_device_id tbsecp3_id_table[] = {
 	TBSECP3_ID(TBSECP3_BOARD_TBS6522H,0x6522,0x0004),
 	TBSECP3_ID(TBSECP3_BOARD_TBS6504H,0x6504,0x0008),
 	TBSECP3_ID(TBSECP3_BOARD_TBS6590SE,0x6590,0x0002),
-	TBSECP3_ID(TBSECP3_BOARD_TBS6916,0x6916,0x0001),			
+	TBSECP3_ID(TBSECP3_BOARD_TBS6916,0x6916,0x0001),
+	TBSECP3_ID(TBSECP3_BOARD_TBS6324,0x6324,0x0010),			
 	{0}
 };
 MODULE_DEVICE_TABLE(pci, tbsecp3_id_table);
diff --git a/drivers/media/pci/tbsecp3/tbsecp3-dvb.c b/drivers/media/pci/tbsecp3/tbsecp3-dvb.c
index 877496fbb4a3..4cd8da311a1e 100644
--- a/drivers/media/pci/tbsecp3/tbsecp3-dvb.c
+++ b/drivers/media/pci/tbsecp3/tbsecp3-dvb.c
@@ -1915,6 +1915,7 @@ static int tbsecp3_frontend_attach(struct tbsecp3_adapter *adapter)
 		break;
 	case TBSECP3_BOARD_TBS6304X:
 	case TBSECP3_BOARD_TBS6304T:
+	case TBSECP3_BOARD_TBS6324:
 		adapter->fe = dvb_attach(tas2971_attach, &tbs6304x_demod_cfg, i2c);
 		if (adapter->fe == NULL)
 		    goto frontend_atach_fail;
diff --git a/drivers/media/pci/tbsecp3/tbsecp3.h b/drivers/media/pci/tbsecp3/tbsecp3.h
index 634d57a4a9f4..6a2b34dbb5a0 100755
--- a/drivers/media/pci/tbsecp3/tbsecp3.h
+++ b/drivers/media/pci/tbsecp3/tbsecp3.h
@@ -90,6 +90,7 @@
 #define TBSECP3_BOARD_TBS6308X	46
 #define TBSECP3_BOARD_TBS6916	47
 #define TBSECP3_BOARD_TBS6312X	48
+#define TBSECP3_BOARD_TBS6324	49
 
 
 #define TBSECP3_MAX_ADAPTERS	(16)