diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
commit | 88c3cdfdde3cf87e1831265ea4246430bef34fc9 (patch) | |
tree | caea510ffb2f81a5ea13b00ecb8a4146ad462048 /drivers/media/dvb/b2c2/Makefile | |
parent | 2b2c3750330325ae5071582b5c4dbdf1c8bc1e51 (diff) | |
parent | a92b7b80579fe68fe229892815c750f6652eb6a9 (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/media/dvb/b2c2/Makefile')
-rw-r--r-- | drivers/media/dvb/b2c2/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/dvb/b2c2/Makefile b/drivers/media/dvb/b2c2/Makefile index 7703812af34f..1a1c3bca55fa 100644 --- a/drivers/media/dvb/b2c2/Makefile +++ b/drivers/media/dvb/b2c2/Makefile | |||
@@ -9,6 +9,4 @@ obj-$(CONFIG_DVB_B2C2_FLEXCOP_PCI) += b2c2-flexcop-pci.o | |||
9 | b2c2-flexcop-usb-objs = flexcop-usb.o | 9 | b2c2-flexcop-usb-objs = flexcop-usb.o |
10 | obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o | 10 | obj-$(CONFIG_DVB_B2C2_FLEXCOP_USB) += b2c2-flexcop-usb.o |
11 | 11 | ||
12 | obj-$(CONFIG_DVB_B2C2_SKYSTAR) += skystar2.o | ||
13 | |||
14 | EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ | 12 | EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ |