aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/Makefile
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-07-22 06:13:07 +0200
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-22 12:53:00 -0300
commit28cae868cd245b6bb2f27bce807e9d78afcf8ea2 (patch)
treefbb450d79e27cdb445f12b93b1b16db2d7978efe /drivers/media/pci/Makefile
parent[media] coda: store IRAM size in struct coda_devtype (diff)
downloadlinux-dev-28cae868cd245b6bb2f27bce807e9d78afcf8ea2.tar.xz
linux-dev-28cae868cd245b6bb2f27bce807e9d78afcf8ea2.zip
[media] solo6x10: move out of staging into drivers/media/pci.
Now that the custom motion detection API has been replaced with a standard API there is no reason anymore to keep it in staging. So (finally!) move it to drivers/media/pci. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci/Makefile')
-rw-r--r--drivers/media/pci/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile
index 35cc57862c01..e5b53fb569ef 100644
--- 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/