summaryrefslogtreecommitdiffstats
path: root/drivers/staging/media/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/staging/media/Makefile
parent401e972fae7d3da80c70e615aa0463f9c7c619ec (diff)
downloadlinux-28cae868cd245b6bb2f27bce807e9d78afcf8ea2.tar.bz2
[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/staging/media/Makefile')
-rw-r--r--drivers/staging/media/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 4f6c0ee0ad13..205eba283326 100644
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -2,7 +2,6 @@ obj-$(CONFIG_DVB_AS102) += as102/
obj-$(CONFIG_I2C_BCM2048) += bcm2048/
obj-$(CONFIG_DVB_CXD2099) += cxd2099/
obj-$(CONFIG_LIRC_STAGING) += lirc/
-obj-$(CONFIG_SOLO6X10) += solo6x10/
obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/
obj-$(CONFIG_VIDEO_GO7007) += go7007/
obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/