diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /drivers/media/dvb/Makefile | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'drivers/media/dvb/Makefile')
| -rw-r--r-- | drivers/media/dvb/Makefile | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile index 16d262ddb45d..c12922c3659b 100644 --- a/drivers/media/dvb/Makefile +++ b/drivers/media/dvb/Makefile | |||
| @@ -2,6 +2,18 @@ | |||
| 2 | # Makefile for the kernel multimedia device drivers. | 2 | # Makefile for the kernel multimedia device drivers. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/ dvb-usb/ pluto2/ siano/ dm1105/ pt1/ | 5 | obj-y := dvb-core/ \ |
| 6 | frontends/ \ | ||
| 7 | ttpci/ \ | ||
| 8 | ttusb-dec/ \ | ||
| 9 | ttusb-budget/ \ | ||
| 10 | b2c2/ \ | ||
| 11 | bt8xx/ \ | ||
| 12 | dvb-usb/ \ | ||
| 13 | pluto2/ \ | ||
| 14 | siano/ \ | ||
| 15 | dm1105/ \ | ||
| 16 | pt1/ \ | ||
| 17 | mantis/ | ||
| 6 | 18 | ||
| 7 | obj-$(CONFIG_DVB_FIREDTV) += firewire/ | 19 | obj-$(CONFIG_DVB_FIREDTV) += firewire/ |