diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/media/dvb/frontends/Makefile | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/media/dvb/frontends/Makefile')
| -rw-r--r-- | drivers/media/dvb/frontends/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile index ad8658ffd60a..a98760fe08a1 100644 --- a/drivers/media/dvb/frontends/Makefile +++ b/drivers/media/dvb/frontends/Makefile | |||
| @@ -26,6 +26,7 @@ obj-$(CONFIG_DVB_TDA80XX) += tda80xx.o | |||
| 26 | obj-$(CONFIG_DVB_TDA10021) += tda10021.o | 26 | obj-$(CONFIG_DVB_TDA10021) += tda10021.o |
| 27 | obj-$(CONFIG_DVB_STV0297) += stv0297.o | 27 | obj-$(CONFIG_DVB_STV0297) += stv0297.o |
| 28 | obj-$(CONFIG_DVB_NXT2002) += nxt2002.o | 28 | obj-$(CONFIG_DVB_NXT2002) += nxt2002.o |
| 29 | obj-$(CONFIG_DVB_NXT200X) += nxt200x.o | ||
| 29 | obj-$(CONFIG_DVB_OR51211) += or51211.o | 30 | obj-$(CONFIG_DVB_OR51211) += or51211.o |
| 30 | obj-$(CONFIG_DVB_OR51132) += or51132.o | 31 | obj-$(CONFIG_DVB_OR51132) += or51132.o |
| 31 | obj-$(CONFIG_DVB_BCM3510) += bcm3510.o | 32 | obj-$(CONFIG_DVB_BCM3510) += bcm3510.o |