commit cff4fa8415a3224a5abdd2b1dd7f431e4ea49366
author Igor M. Liplianin <liplianin@netup.ru> Fri Sep 23 11:17:41 2011 -0300
committer Mauro Carvalho Chehab <mchehab@redhat.com> Fri Sep 23 15:00:57 2011 -0300
tree e27e0d5998d3e47a8fe90380b3c166993b121239
parent 08347cdd2d745cdcd82e8c4aa2804923df298f33

[media] altera-stapl: it is time to move out from staging

[mchehab@redhat.com: Fix a merge conflict]
Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/misc/Makefile

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 8f3efb6..b26495a 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -47,3 +47,4 @@
 obj-y				+= lis3lv02d/
 obj-y				+= carma/
 obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
+obj-$(CONFIG_ALTERA_STAPL)	+=altera-stapl/