aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/Kconfig
diff options
context:
space:
mode:
authorIgor M. Liplianin <liplianin@netup.ru>2011-09-23 10:17:41 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-23 14:00:57 -0400
commitcff4fa8415a3224a5abdd2b1dd7f431e4ea49366 (patch)
treee27e0d5998d3e47a8fe90380b3c166993b121239 /drivers/misc/Kconfig
parent08347cdd2d745cdcd82e8c4aa2804923df298f33 (diff)
[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>
Diffstat (limited to 'drivers/misc/Kconfig')
-rw-r--r--drivers/misc/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 2d6423c2d193..50d5f27f09d0 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -506,5 +506,6 @@ source "drivers/misc/iwmc3200top/Kconfig"
506source "drivers/misc/ti-st/Kconfig" 506source "drivers/misc/ti-st/Kconfig"
507source "drivers/misc/lis3lv02d/Kconfig" 507source "drivers/misc/lis3lv02d/Kconfig"
508source "drivers/misc/carma/Kconfig" 508source "drivers/misc/carma/Kconfig"
509source "drivers/misc/altera-stapl/Kconfig"
509 510
510endif # MISC_DEVICES 511endif # MISC_DEVICES