diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-09 13:14:32 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-09 13:14:32 -0400 |
| commit | 8dd9117cc7a021ced1c5cf177e2d44dd92b88617 (patch) | |
| tree | cad990f58f9ec6d400226dda86718fc10781416e /drivers/media/usb/uvc/Makefile | |
| parent | 16e310ae6ed352c4963b1f2413fcd88fa693eeda (diff) | |
| parent | 547b1e81afe3119f7daf702cc03b158495535a25 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Pulled mainline in order to get the UAPI infrastructure already
merged before I pull in David Howells's UAPI trees for networking.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/media/usb/uvc/Makefile')
| -rw-r--r-- | drivers/media/usb/uvc/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/usb/uvc/Makefile b/drivers/media/usb/uvc/Makefile new file mode 100644 index 00000000000..c26d12fdb8f --- /dev/null +++ b/drivers/media/usb/uvc/Makefile @@ -0,0 +1,6 @@ +uvcvideo-objs := uvc_driver.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_ctrl.o \ + uvc_status.o uvc_isight.o uvc_debugfs.o +ifeq ($(CONFIG_MEDIA_CONTROLLER),y) +uvcvideo-objs += uvc_entity.o +endif +obj-$(CONFIG_USB_VIDEO_CLASS) += uvcvideo.o |