Move the budget-driver from "ttpci-budget" to "ttpci", because the

devices are so similar. Perhaps it will be possible to share more code
between these drivers later on.

10 files changed, 79 insertions, 84 deletions

diff --git a/linux/drivers/media/dvb/ttpci-budget/Kconfig b/linux/drivers/media/dvb/ttpci-budget/Kconfig
deleted file mode 100644
index 0098520cc..000000000
--- a/linux/drivers/media/dvb/ttpci-budget/Kconfig
+++ /dev/null
@@ -1,67 +0,0 @@
-config DVB_BUDGET
-	tristate "Budget cards"
-	depends on DVB_CORE
-	help
-	  Support for simple SAA7146 based DVB cards
-	  (so called Budget- or Nova-PCI cards) without onboard
-	  MPEG2 decoder.
-
-	  Say Y if you own such a card and want to use it.
-
-	  This driver is available as a module called
-	  dvb-ttpci-budget.o ( = code which can be inserted in
-	  and removed from the running kernel whenever you want).
-	  If you want to compile it as a module, say M
-	  here and read <file:Documentation/modules.txt>.
-
-config DVB_BUDGET_CI
-	tristate "Budget cards with onboard CI connector"
-	depends on VIDEO_DEV && DVB_CORE && DVB_BUDGET
-	help
-	  Support for simple SAA7146 based DVB cards
-	  (so called Budget- or Nova-PCI cards) without onboard
-	  MPEG2 decoder, but with onboard Common Interface connector.
-
-	  Say Y if you own such a card and want to use it.
-
-	  This driver is available as a module called
-	  dvb-ttpci-budget-av.o ( = code which can be inserted in
-	  and removed from the running kernel whenever you want).
-	  If you want to compile it as a module, say M
-	  here and read <file:Documentation/modules.txt>.
-
-config DVB_BUDGET_AV
-	tristate "Budget cards with analog video inputs"
-	depends on VIDEO_DEV && DVB_CORE && DVB_BUDGET
-	help
-	  Support for simple SAA7146 based DVB cards
-	  (so called Budget- or Nova-PCI cards) without onboard
-	  MPEG2 decoder, but with one or more analog video inputs.
-
-	  Say Y if you own such a card and want to use it.
-
-	  This driver is available as a module called
-	  dvb-ttpci-budget-av.o ( = code which can be inserted in
-	  and removed from the running kernel whenever you want).
-	  here and read <file:Documentation/modules.txt>.
-
-config DVB_BUDGET_PATCH
-	tristate "AV7110 cards with Budget Patch"
-	depends on DVB_CORE && DVB_BUDGET
-	help
-	  Support for Budget Patch (full TS) modification on 
-	  SAA7146+AV7110 based cards (DVB-S cards). This
-	  driver doesn't use onboard MPEG2 decoder. The 
-	  card is driven in Budget-only mode. Card is
-	  required to have loaded firmware to tune properly.
-	  Firmware can be loaded by insertion and removal of
-	  standard AV7110 driver prior to loading this
-	  driver.
-
-	  Say Y if you own such a card and want to use it.
-
-	  This driver is available as a module called
-	  dvb-ttpci-budget-patch.o ( = code which can be inserted in
-	  and removed from the running kernel whenever you want).
-	  If you want to compile it as a module, say M
-	  here and read <file:Documentation/modules.txt>.
diff --git a/linux/drivers/media/dvb/ttpci-budget/Makefile b/linux/drivers/media/dvb/ttpci-budget/Makefile
deleted file mode 100644
index 21923cf20..000000000
--- a/linux/drivers/media/dvb/ttpci-budget/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Makefile for the kernel SAA7146 FULL TS DVB device driver
-#
-
-dvb-ttpci-budget-objs := budget.o
-dvb-ttpci-budget-av-objs := budget-av.o
-dvb-ttpci-budget-ci-objs := budget-ci.o
-dvb-ttpci-budget-patch-objs := budget-patch.o
-
-obj-$(CONFIG_DVB_BUDGET) += budget-core.o dvb-ttpci-budget.o
-obj-$(CONFIG_DVB_BUDGET_CI) += budget-core.o dvb-ttpci-budget-ci.o
-obj-$(CONFIG_DVB_BUDGET_AV) += budget-core.o dvb-ttpci-budget-av.o
-obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-core.o dvb-ttpci-budget-patch.o
-
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -I$(src)/../../common/ -I$(src)/../../common/saa7146
diff --git a/linux/drivers/media/dvb/ttpci/Kconfig b/linux/drivers/media/dvb/ttpci/Kconfig
index 8396852b0..64a4f9788 100644
--- a/linux/drivers/media/dvb/ttpci/Kconfig
+++ b/linux/drivers/media/dvb/ttpci/Kconfig
@@ -22,3 +22,71 @@ config DVB_AV7110_OSD
 	  its menus, so say Y if you want to use this software.
 
 	  All other people say N.
+
+config DVB_BUDGET
+	tristate "Budget cards"
+	depends on DVB_CORE
+	help
+	  Support for simple SAA7146 based DVB cards
+	  (so called Budget- or Nova-PCI cards) without onboard
+	  MPEG2 decoder.
+
+	  Say Y if you own such a card and want to use it.
+
+	  This driver is available as a module called
+	  dvb-ttpci-budget.o ( = code which can be inserted in
+	  and removed from the running kernel whenever you want).
+	  If you want to compile it as a module, say M
+	  here and read <file:Documentation/modules.txt>.
+
+config DVB_BUDGET_CI
+	tristate "Budget cards with onboard CI connector"
+	depends on VIDEO_DEV && DVB_CORE && DVB_BUDGET
+	help
+	  Support for simple SAA7146 based DVB cards
+	  (so called Budget- or Nova-PCI cards) without onboard
+	  MPEG2 decoder, but with onboard Common Interface connector.
+
+	  Say Y if you own such a card and want to use it.
+
+	  This driver is available as a module called
+	  dvb-ttpci-budget-av.o ( = code which can be inserted in
+	  and removed from the running kernel whenever you want).
+	  If you want to compile it as a module, say M
+	  here and read <file:Documentation/modules.txt>.
+
+config DVB_BUDGET_AV
+	tristate "Budget cards with analog video inputs"
+	depends on VIDEO_DEV && DVB_CORE && DVB_BUDGET
+	help
+	  Support for simple SAA7146 based DVB cards
+	  (so called Budget- or Nova-PCI cards) without onboard
+	  MPEG2 decoder, but with one or more analog video inputs.
+
+	  Say Y if you own such a card and want to use it.
+
+	  This driver is available as a module called
+	  dvb-ttpci-budget-av.o ( = code which can be inserted in
+	  and removed from the running kernel whenever you want).
+	  here and read <file:Documentation/modules.txt>.
+
+config DVB_BUDGET_PATCH
+	tristate "AV7110 cards with Budget Patch"
+	depends on DVB_CORE && DVB_BUDGET
+	help
+	  Support for Budget Patch (full TS) modification on 
+	  SAA7146+AV7110 based cards (DVB-S cards). This
+	  driver doesn't use onboard MPEG2 decoder. The 
+	  card is driven in Budget-only mode. Card is
+	  required to have loaded firmware to tune properly.
+	  Firmware can be loaded by insertion and removal of
+	  standard AV7110 driver prior to loading this
+	  driver.
+
+	  Say Y if you own such a card and want to use it.
+
+	  This driver is available as a module called
+	  dvb-ttpci-budget-patch.o ( = code which can be inserted in
+	  and removed from the running kernel whenever you want).
+	  If you want to compile it as a module, say M
+	  here and read <file:Documentation/modules.txt>.
diff --git a/linux/drivers/media/dvb/ttpci/Makefile b/linux/drivers/media/dvb/ttpci/Makefile
index 5a9fd0c0c..c1e1f7b4c 100644
--- a/linux/drivers/media/dvb/ttpci/Makefile
+++ b/linux/drivers/media/dvb/ttpci/Makefile
@@ -1,9 +1,18 @@
 #
-# Makefile for the kernel AV7110 DVB device driver
+# Makefile for the kernel SAA7146 FULL TS DVB device driver
+# and the AV7110 DVB device driver
 #
 
+dvb-ttpci-budget-objs := budget.o
+dvb-ttpci-budget-av-objs := budget-av.o
+dvb-ttpci-budget-ci-objs := budget-ci.o
+dvb-ttpci-budget-patch-objs := budget-patch.o
 dvb-ttpci-objs := av7110.o av7110_ipack.o av7110_ir.o
 
+obj-$(CONFIG_DVB_BUDGET) += budget-core.o dvb-ttpci-budget.o
+obj-$(CONFIG_DVB_BUDGET_CI) += budget-core.o dvb-ttpci-budget-ci.o
+obj-$(CONFIG_DVB_BUDGET_AV) += budget-core.o dvb-ttpci-budget-av.o
+obj-$(CONFIG_DVB_BUDGET_PATCH) += budget-core.o dvb-ttpci-budget-patch.o
 obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -I$(src)/../../common/ -I$(src)/../../common/saa7146
+EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
diff --git a/linux/drivers/media/dvb/ttpci-budget/budget-av.c b/linux/drivers/media/dvb/ttpci/budget-av.c
index 66173a760..66173a760 100644
--- a/linux/drivers/media/dvb/ttpci-budget/budget-av.c
+++ b/linux/drivers/media/dvb/ttpci/budget-av.c
diff --git a/linux/drivers/media/dvb/ttpci-budget/budget-ci.c b/linux/drivers/media/dvb/ttpci/budget-ci.c
index a4f5bad49..a4f5bad49 100644
--- a/linux/drivers/media/dvb/ttpci-budget/budget-ci.c
+++ b/linux/drivers/media/dvb/ttpci/budget-ci.c
diff --git a/linux/drivers/media/dvb/ttpci-budget/budget-core.c b/linux/drivers/media/dvb/ttpci/budget-core.c
index 71cbcfffd..71cbcfffd 100644
--- a/linux/drivers/media/dvb/ttpci-budget/budget-core.c
+++ b/linux/drivers/media/dvb/ttpci/budget-core.c
diff --git a/linux/drivers/media/dvb/ttpci-budget/budget-patch.c b/linux/drivers/media/dvb/ttpci/budget-patch.c
index 7e1cb6d73..7e1cb6d73 100644
--- a/linux/drivers/media/dvb/ttpci-budget/budget-patch.c
+++ b/linux/drivers/media/dvb/ttpci/budget-patch.c
diff --git a/linux/drivers/media/dvb/ttpci-budget/budget.c b/linux/drivers/media/dvb/ttpci/budget.c
index 545101f44..545101f44 100644
--- a/linux/drivers/media/dvb/ttpci-budget/budget.c
+++ b/linux/drivers/media/dvb/ttpci/budget.c
diff --git a/linux/drivers/media/dvb/ttpci-budget/budget.h b/linux/drivers/media/dvb/ttpci/budget.h
index 09dbb2735..09dbb2735 100644
--- a/linux/drivers/media/dvb/ttpci-budget/budget.h
+++ b/linux/drivers/media/dvb/ttpci/budget.h