From cff4fa8415a3224a5abdd2b1dd7f431e4ea49366 Mon Sep 17 00:00:00 2001 From: "Igor M. Liplianin" Date: Fri, 23 Sep 2011 11:17:41 -0300 Subject: [media] altera-stapl: it is time to move out from staging [mchehab@redhat.com: Fix a merge conflict] Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/Kconfig | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/staging/Kconfig') diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 7209277..e9aa688 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -142,8 +142,6 @@ source "drivers/staging/ste_rmi4/Kconfig" source "drivers/staging/gma500/Kconfig" -source "drivers/staging/altera-stapl/Kconfig" - source "drivers/staging/mei/Kconfig" source "drivers/staging/nvec/Kconfig" -- cgit v1.1