V4L/DVB (13795): [Mantis/Hopper] Code overhaul, add Hopper devices into the PCI ID list

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 24 insertions, 18 deletions

diff --git a/drivers/media/dvb/mantis/Makefile b/drivers/media/dvb/mantis/Makefile
index bb88cdc98ce0..399c9018cdb0 100644
--- a/drivers/media/dvb/mantis/Makefile
+++ b/drivers/media/dvb/mantis/Makefile
@@ -1,21 +1,27 @@
-mantis-objs =   mantis_core.o   \
-                mantis_uart.o   \
-                mantis_dma.o    \
-                mantis_pci.o    \
-                mantis_i2c.o    \
-                mantis_dvb.o    \
-                mantis_evm.o    \
-                mantis_hif.o    \
-                mantis_ca.o     \
-                mantis_pcmcia.o \
-                mantis_vp1033.o \
-                mantis_vp1034.o \
-                mantis_vp1041.o \
-                mantis_vp2033.o \
-                mantis_vp2040.o \
-                mantis_vp3028.o \
-                mantis_vp3030.o
+mantis_core-objs :=     mantis_ioc.o    \
+                        mantis_uart.o   \
+                        mantis_dma.o    \
+                        mantis_pci.o    \
+                        mantis_i2c.o    \
+                        mantis_dvb.o    \
+                        mantis_evm.o    \
+                        mantis_hif.o    \
+                        mantis_ca.o     \
+                        mantis_pcmcia.o
 
-obj-$(CONFIG_DVB_MANTIS) += mantis.o
+mantis-objs     :=      mantis_cards.o  \
+                        mantis_vp1033.o \
+                        mantis_vp1034.o \
+                        mantis_vp1041.o \
+                        mantis_vp2033.o \
+                        mantis_vp2040.o \
+                        mantis_vp3030.o
+
+hopper-objs     :=      hopper_cards.o  \
+                        hopper_vp3028.o
+
+obj-$(CONFIG_MANTIS_CORE)       += mantis_core.o
+obj-$(CONFIG_DVB_MANTIS)        += mantis.o
+obj-$(CONFIG_DVB_HOPPER)        += hopper.o
 
 EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/