git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
usbvideo
/
Makefile
diff --git
a/drivers/media/video/usbvideo/Makefile
b/drivers/media/video/usbvideo/Makefile
index
bb52eb8
..
4a1b144
100644
(file)
--- a/
drivers/media/video/usbvideo/Makefile
+++ b/
drivers/media/video/usbvideo/Makefile
@@
-2,3
+2,4
@@
obj-$(CONFIG_VIDEO_USBVIDEO) += usbvideo.o
obj-$(CONFIG_USB_IBMCAM) += ibmcam.o ultracam.o
obj-$(CONFIG_USB_KONICAWC) += konicawc.o
obj-$(CONFIG_USB_VICAM) += vicam.o
+obj-$(CONFIG_USB_QUICKCAM_MESSENGER) += quickcam_messenger.o