summaryrefslogtreecommitdiff
path: root/drivers/media/dvb/dvb-usb/Makefile
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2012-06-20 05:21:34 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-04 14:56:37 +0400
commit41a0abf7100928b412be4d35d62fd77c83064a9b (patch)
tree8787aba8c9b6860c8315ebf49d596bb027e3cf92 /drivers/media/dvb/dvb-usb/Makefile
parent62a5f449cab52a458120ba5b046675ee2f81000f (diff)
downloadlinux-41a0abf7100928b412be4d35d62fd77c83064a9b.tar.xz
[media] dvb_usb_v2: merge files dvb_usb_init.c and dvb_usb_dvb.c
Merge files dvb_usb_init.c and dvb_usb_dvb.c to dvb_usb_core.c. It is still under 1000 lines of code after all the optimization so put it one file. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/Makefile')
-rw-r--r--drivers/media/dvb/dvb-usb/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile
index 490e2a295f3f..50f506e0632a 100644
--- a/drivers/media/dvb/dvb-usb/Makefile
+++ b/drivers/media/dvb/dvb-usb/Makefile
@@ -1,7 +1,7 @@
dvb-usb-objs = dvb-usb-firmware.o dvb-usb-init.o dvb-usb-urb.o dvb-usb-i2c.o dvb-usb-dvb.o dvb-usb-remote.o usb-urb.o
obj-$(CONFIG_DVB_USB) += dvb-usb.o
-dvb_usbv2-objs = dvb_usb_init.o dvb_usb_urb.o dvb_usb_dvb.o usb_urb.o
+dvb_usbv2-objs = dvb_usb_core.o dvb_usb_urb.o usb_urb.o
obj-$(CONFIG_DVB_USB_V2) += dvb_usbv2.o
obj-$(CONFIG_DVB_USB_FIRMWARE) += dvb_usb_firmware.o