7 files changed, 36 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/Kconfig b/linux/drivers/media/dvb/Kconfig
index 753fdae94..4735c121c 100644
--- a/linux/drivers/media/dvb/Kconfig
+++ b/linux/drivers/media/dvb/Kconfig
@@ -37,5 +37,11 @@ comment "Supported SAA7146 based PCI Adapters"
 
 source "drivers/media/dvb/ttpci/Kconfig"
 
+comment "Supported USB Adapters"
+	depends on DVB && USB
+
+source "drivers/media/dvb/ttusb-budget/Kconfig"
+source "drivers/media/dvb/ttusb-dec/Kconfig"
+
 endmenu
 
diff --git a/linux/drivers/media/dvb/Makefile b/linux/drivers/media/dvb/Makefile
index 0dd59252d..e65d885cf 100644
--- a/linux/drivers/media/dvb/Makefile
+++ b/linux/drivers/media/dvb/Makefile
@@ -2,4 +2,4 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-obj-y        := dvb-core/ frontends/ ttpci/ # ttusb-budget/
+obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ 
diff --git a/linux/drivers/media/dvb/ttusb-budget/Kconfig b/linux/drivers/media/dvb/ttusb-budget/Kconfig
new file mode 100644
index 000000000..e253233f9
--- /dev/null
+++ b/linux/drivers/media/dvb/ttusb-budget/Kconfig
@@ -0,0 +1,11 @@
+config DVB_TTUSB_BUDGET
+	tristate "Technotrend/Hauppauge Nova-USB device suppport"
+	depends on DVB_CORE && USB
+	help
+	  Support for external USB adapters designed by Technotrend and
+	  produced by Hauppauge, shipped under the brand name 'Nova-USB'.
+
+          These devices don't have a MPEG decoder built in, so you need
+	  an external software decoder to watch TV.	  
+
+	  Say Y if you own such a device and want to use it.
diff --git a/linux/drivers/media/dvb/ttusb-budget/Makefile b/linux/drivers/media/dvb/ttusb-budget/Makefile
index 54b85d2a7..a57b9aee6 100644
--- a/linux/drivers/media/dvb/ttusb-budget/Makefile
+++ b/linux/drivers/media/dvb/ttusb-budget/Makefile
@@ -1,7 +1,3 @@
-#
-# Makefile for the kernel SAA7146 FULL TS DVB device driver
-#
-
 obj-$(CONFIG_DVB_TTUSB_BUDGET) += dvb-ttusb-budget.o
 
 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
diff --git a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 8c2bd94c8..58a9a4f4f 100644
--- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -27,7 +27,8 @@
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/dmx.h>
 #include <linux/pci.h>
-#include "dvb_compat.h"
+
+#include "dvb_functions.h"
 
 /*
   TTUSB_HWSECTIONS:
diff --git a/linux/drivers/media/dvb/ttusb-dec/Kconfig b/linux/drivers/media/dvb/ttusb-dec/Kconfig
new file mode 100644
index 000000000..7a5401f57
--- /dev/null
+++ b/linux/drivers/media/dvb/ttusb-dec/Kconfig
@@ -0,0 +1,12 @@
+config DVB_TTUSB_DEC
+	tristate "Technotrend/Hauppauge Nova-USB device suppport"
+	depends on DVB_CORE && USB
+	help
+	  Support for external USB adapters designed by Technotrend and
+	  produced by Hauppauge, shipped under the brand name 'DEC2000-T'.
+
+          Even if these devices have a MPEG decoder built in, they transmit
+	  only compressed MPEG data over the USB bus, so you need
+	  an external software decoder to watch TV on your computer.	  
+
+	  Say Y if you own such a device and want to use it.
diff --git a/linux/drivers/media/dvb/ttusb-dec/Makefile b/linux/drivers/media/dvb/ttusb-dec/Makefile
new file mode 100644
index 000000000..39364517f
--- /dev/null
+++ b/linux/drivers/media/dvb/ttusb-dec/Makefile
@@ -0,0 +1,4 @@
+
+obj-$(CONFIG_DVB_TTUSB_DEC) += ttusb_dec.o dec2000_frontend.o
+
+EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/