Index: build-2.6/Makefile
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/build-2.6/Makefile,v
retrieving revision 1.41
diff -p -u -r1.41 Makefile
--- build-2.6/Makefile	13 Jan 2005 13:26:11 -0000	1.41
+++ build-2.6/Makefile	15 Feb 2005 22:51:44 -0000
@@ -120,6 +120,7 @@ obj-m += tda80xx.o
 obj-m += dvb_dummy_fe.o
 obj-m += tda10021.o
 obj-m += stv0297.o
+obj-m += or51211.o
 
 obj-m += dib3000-common.o
 obj-m += dib3000mb.o
Index: linux/drivers/media/dvb/bt8xx/Kconfig
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/linux/drivers/media/dvb/bt8xx/Kconfig,v
retrieving revision 1.9
diff -p -u -r1.9 Kconfig
--- linux/drivers/media/dvb/bt8xx/Kconfig	6 Jan 2005 09:09:38 -0000	1.9
+++ linux/drivers/media/dvb/bt8xx/Kconfig	15 Feb 2005 22:51:46 -0000
@@ -5,9 +5,11 @@ config DVB_BT8XX
 	select DVB_SP887X
 	select DVB_NXT6000
 	select DVB_CX24110
+	select DVB_OR51211
 	help
 	  Support for PCI cards based on the Bt8xx PCI bridge. Examples are
-	  the Nebula cards, the Pinnacle PCTV cards and Twinhan DST cards.
+	  the Nebula cards, the Pinnacle PCTV cards, the Twinhan DST cards and 
+	  pcHDTV HD2000 cards.
 
           Since these cards have no MPEG decoder onboard, they transmit
 	  only compressed MPEG data over the PCI bus, so you need
Index: linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c,v
retrieving revision 1.36
diff -p -u -r1.36 dvb-bt8xx.c
--- linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c	6 Jan 2005 12:10:51 -0000	1.36
+++ linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c	15 Feb 2005 22:51:46 -0000
@@ -369,6 +369,20 @@ static struct dst_config dst_config = {
 };
 
 
+static int or51211_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name)
+{
+	struct dvb_bt8xx_card* bt = (struct dvb_bt8xx_card*) fe->dvb->priv;
+
+	return request_firmware(fw, name, &bt->bt->dev->dev);
+}
+
+static struct or51211_config or51211_config = {
+
+	.demod_address = 0x15,
+	.request_firmware = or51211_request_firmware,
+};
+
+
 static int vp3021_alps_tded4_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
 {
 	struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe->dvb->priv;
@@ -458,6 +472,13 @@ static void frontend_init(struct dvb_bt8
 			break;
 		}
 		break;
+
+	case BTTV_PC_HDTV:
+		card->fe = or51211_attach(&or51211_config, card->i2c_adapter, card->bt);
+		if (card->fe != NULL) {
+			break;
+		}
+		break;
 	}
 
 	if (card->fe == NULL) {
@@ -637,6 +658,12 @@ static int dvb_bt8xx_probe(struct device
 		 * RISC+FIFO ENABLE */
 		break;
 
+	case BTTV_PC_HDTV:
+		card->gpio_mode = 0x0100EC7B;
+		card->op_sync_orin = 0;
+		card->irq_err_ignore = 0;
+		break;
+
 	default:
 		printk(KERN_WARNING "dvb_bt8xx: Unknown bttv card type: %d.\n",
 				sub->core->type);
Index: linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h,v
retrieving revision 1.14
diff -p -u -r1.14 dvb-bt8xx.h
--- linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h	6 Jan 2005 12:10:51 -0000	1.14
+++ linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h	15 Feb 2005 22:51:46 -0000
@@ -34,6 +34,7 @@
 #include "dst.h"
 #include "nxt6000.h"
 #include "cx24110.h"
+#include "or51211.h"
 
 struct dvb_bt8xx_card {
 	struct semaphore lock;
Index: linux/drivers/media/dvb/frontends/Kconfig
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/linux/drivers/media/dvb/frontends/Kconfig,v
retrieving revision 1.34
diff -p -u -r1.34 Kconfig
--- linux/drivers/media/dvb/frontends/Kconfig	5 Feb 2005 18:09:50 -0000	1.34
+++ linux/drivers/media/dvb/frontends/Kconfig	15 Feb 2005 22:51:47 -0000
@@ -158,4 +158,11 @@ config DVB_NXT2002
 	help
 	  An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
 
+config DVB_OR51211
+	tristate "or51211 based (pcHDTV HD2000 card)"
+	depends on DVB_CORE
+	select FW_LOADER
+	help
+	  An ATSC 8VSB tuner module. Say Y when you want to support this frontend.
+
 endmenu
Index: linux/drivers/media/dvb/frontends/Makefile
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/linux/drivers/media/dvb/frontends/Makefile,v
retrieving revision 1.21
diff -p -u -r1.21 Makefile
--- linux/drivers/media/dvb/frontends/Makefile	16 Dec 2004 15:45:54 -0000	1.21
+++ linux/drivers/media/dvb/frontends/Makefile	15 Feb 2005 22:51:47 -0000
@@ -25,4 +25,5 @@ obj-$(CONFIG_DVB_TDA80XX) += tda80xx.o
 obj-$(CONFIG_DVB_TDA10021) += tda10021.o
 obj-$(CONFIG_DVB_STV0297) += stv0297.o
 obj-$(CONFIG_DVB_NXT2002) += nxt2002.o
+obj-$(CONFIG_DVB_OR51211) += or51211.o