diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-06 19:11:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-06 19:11:57 -0400 |
| commit | 28b8383d5d4d9b636c3734c993563bafdc2ab3c3 (patch) | |
| tree | 95fd3fc6e12cdca5cbf999595273bda9ae104922 /drivers/media/Makefile | |
| parent | c28cf0fdcd38e912fa72258d78cb213b716247d6 (diff) | |
| parent | a80c5aa6da485da63def31442a19cdd6ff495ce6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (7499): v4l/dvb Kconfig: Fix bugzilla #10067
V4L/DVB (7495): s5h1409: fix blown-away bit in function s5h1409_set_gpio
V4L/DVB (7460): bttv: Bt832 - fix possible NULL pointer deref
Diffstat (limited to 'drivers/media/Makefile')
| -rw-r--r-- | drivers/media/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/Makefile b/drivers/media/Makefile index 8cf91353b56a..7b8bb6949f5e 100644 --- a/drivers/media/Makefile +++ b/drivers/media/Makefile | |||
| @@ -6,3 +6,6 @@ obj-y := common/ | |||
| 6 | obj-y += video/ | 6 | obj-y += video/ |
| 7 | obj-$(CONFIG_VIDEO_DEV) += radio/ | 7 | obj-$(CONFIG_VIDEO_DEV) += radio/ |
| 8 | obj-$(CONFIG_DVB_CORE) += dvb/ | 8 | obj-$(CONFIG_DVB_CORE) += dvb/ |
| 9 | ifeq ($(CONFIG_DVB_CORE),) | ||
| 10 | obj-$(CONFIG_VIDEO_TUNER) += dvb/frontends/ | ||
| 11 | endif | ||