diff options
author | Igor M. Liplianin <liplianin@netup.ru> | 2011-09-23 10:17:41 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-23 14:00:57 -0400 |
commit | cff4fa8415a3224a5abdd2b1dd7f431e4ea49366 (patch) | |
tree | e27e0d5998d3e47a8fe90380b3c166993b121239 /drivers/staging/Kconfig | |
parent | 08347cdd2d745cdcd82e8c4aa2804923df298f33 (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/staging/Kconfig')
-rw-r--r-- | drivers/staging/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 720927742eb..e9aa6889270 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig | |||
@@ -142,8 +142,6 @@ source "drivers/staging/ste_rmi4/Kconfig" | |||
142 | 142 | ||
143 | source "drivers/staging/gma500/Kconfig" | 143 | source "drivers/staging/gma500/Kconfig" |
144 | 144 | ||
145 | source "drivers/staging/altera-stapl/Kconfig" | ||
146 | |||
147 | source "drivers/staging/mei/Kconfig" | 145 | source "drivers/staging/mei/Kconfig" |
148 | 146 | ||
149 | source "drivers/staging/nvec/Kconfig" | 147 | source "drivers/staging/nvec/Kconfig" |