projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[linux-2.6-block.git]
/
drivers
/
media
/
pci
/
Makefile
diff --git
a/drivers/media/pci/Makefile
b/drivers/media/pci/Makefile
index 35cc57862c01be0df5e34de063a7bc6743496cbf..e5b53fb569efaf038d4f86a010ec83e90c06d5e6 100644
(file)
--- a/
drivers/media/pci/Makefile
+++ b/
drivers/media/pci/Makefile
@@
-24,3
+24,4
@@
obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
obj-$(CONFIG_VIDEO_SAA7164) += saa7164/
obj-$(CONFIG_VIDEO_MEYE) += meye/
obj-$(CONFIG_STA2X11_VIP) += sta2x11/
+obj-$(CONFIG_VIDEO_SOLO6X10) += solo6x10/