diff options
| author | Igor M. Liplianin <liplianin@netup.ru> | 2011-09-23 11:17:41 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-23 15:00:57 -0300 |
| commit | cff4fa8415a3224a5abdd2b1dd7f431e4ea49366 (patch) | |
| tree | e27e0d5998d3e47a8fe90380b3c166993b121239 /drivers/media/video/cx23885/cx23885-cards.c | |
| 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/media/video/cx23885/cx23885-cards.c')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-cards.c | 2 |
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 76b7563de39..62fd25e7633 100644 --- a/drivers/media/video/cx23885/cx23885-cards.c +++ b/drivers/media/video/cx23885/cx23885-cards.c @@ -25,8 +25,8 @@ #include <linux/delay.h> #include <media/cx25840.h> #include <linux/firmware.h> +#include <misc/altera.h> -#include "../../../staging/altera-stapl/altera.h" #include "cx23885.h" #include "tuner-xc2028.h" #include "netup-eeprom.h" |