aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885
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/media/video/cx23885
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/media/video/cx23885')
-rw-r--r--drivers/media/video/cx23885/cx23885-cards.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 76b7563de39c..62fd25e7633b 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -25,8 +25,8 @@
25#include <linux/delay.h> 25#include <linux/delay.h>
26#include <media/cx25840.h> 26#include <media/cx25840.h>
27#include <linux/firmware.h> 27#include <linux/firmware.h>
28#include <misc/altera.h>
28 29
29#include "../../../staging/altera-stapl/altera.h"
30#include "cx23885.h" 30#include "cx23885.h"
31#include "tuner-xc2028.h" 31#include "tuner-xc2028.h"
32#include "netup-eeprom.h" 32#include "netup-eeprom.h"