diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 19:23:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 19:23:52 -0700 |
| commit | 3a57a788757738b8f80a82d4f5101fefb8fd7a58 (patch) | |
| tree | 697a0e37cc3c7d02412f6743f52156897f7ba553 /drivers/media/video/Makefile | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| parent | V4L/DVB (8178): uvc: Fix compilation breakage for the other drivers, if uvc is selected (diff) | |
| download | linux-dev-3a57a788757738b8f80a82d4f5101fefb8fd7a58.tar.xz linux-dev-3a57a788757738b8f80a82d4f5101fefb8fd7a58.zip | |
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 (8178): uvc: Fix compilation breakage for the other drivers, if uvc is selected
V4L/DVB (8145a): USB Video Class driver
Diffstat (limited to 'drivers/media/video/Makefile')
| -rw-r--r-- | drivers/media/video/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index dff0d6abe917..ecbbfaab24d5 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -136,6 +136,8 @@ obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o obj-$(CONFIG_VIDEO_AU0828) += au0828/ +obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/ + EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core EXTRA_CFLAGS += -Idrivers/media/dvb/frontends EXTRA_CFLAGS += -Idrivers/media/common/tuners |