diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/media/dvb/dvb-usb/Makefile | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/media/dvb/dvb-usb/Makefile')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile index 1a192453b0e7..4bac13da0c39 100644 --- a/drivers/media/dvb/dvb-usb/Makefile +++ b/drivers/media/dvb/dvb-usb/Makefile | |||
| @@ -88,6 +88,12 @@ obj-$(CONFIG_DVB_USB_EC168) += dvb-usb-ec168.o | |||
| 88 | dvb-usb-az6027-objs = az6027.o | 88 | dvb-usb-az6027-objs = az6027.o |
| 89 | obj-$(CONFIG_DVB_USB_AZ6027) += dvb-usb-az6027.o | 89 | obj-$(CONFIG_DVB_USB_AZ6027) += dvb-usb-az6027.o |
| 90 | 90 | ||
| 91 | dvb-usb-lmedm04-objs = lmedm04.o | ||
| 92 | obj-$(CONFIG_DVB_USB_LME2510) += dvb-usb-lmedm04.o | ||
| 93 | |||
| 94 | dvb-usb-technisat-usb2-objs = technisat-usb2.o | ||
| 95 | obj-$(CONFIG_DVB_USB_TECHNISAT_USB2) += dvb-usb-technisat-usb2.o | ||
| 96 | |||
| 91 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ | 97 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ |
| 92 | # due to tuner-xc3028 | 98 | # due to tuner-xc3028 |
| 93 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 99 | EXTRA_CFLAGS += -Idrivers/media/common/tuners |