diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /drivers/media/dvb/dvb-usb/Makefile | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'drivers/media/dvb/dvb-usb/Makefile')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/dvb/dvb-usb/Makefile b/drivers/media/dvb/dvb-usb/Makefile index 72c92cb69a2..1a192453b0e 100644 --- a/drivers/media/dvb/dvb-usb/Makefile +++ b/drivers/media/dvb/dvb-usb/Makefile | |||
| @@ -85,6 +85,9 @@ obj-$(CONFIG_DVB_USB_FRIIO) += dvb-usb-friio.o | |||
| 85 | dvb-usb-ec168-objs = ec168.o | 85 | dvb-usb-ec168-objs = ec168.o |
| 86 | obj-$(CONFIG_DVB_USB_EC168) += dvb-usb-ec168.o | 86 | obj-$(CONFIG_DVB_USB_EC168) += dvb-usb-ec168.o |
| 87 | 87 | ||
| 88 | dvb-usb-az6027-objs = az6027.o | ||
| 89 | obj-$(CONFIG_DVB_USB_AZ6027) += dvb-usb-az6027.o | ||
| 90 | |||
| 88 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ | 91 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ |
| 89 | # due to tuner-xc3028 | 92 | # due to tuner-xc3028 |
| 90 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 93 | EXTRA_CFLAGS += -Idrivers/media/common/tuners |