Staging: cx23885: fix include of altera.h
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 8 Jun 2011 16:18:32 +0000 (09:18 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 8 Jun 2011 16:18:32 +0000 (09:18 -0700)
The cx23885 driver was including staging/altera.h, but that file has
moved back into the driver directory.

Why a non-staging driver was including a staging driver is beyond me,
but this fixes the build so everything is happy for now.

For the record, it's not ok for a non-staging driver to depend on a
staging one, as that implies that the non-staging one should also be in
the staging tree if that's needed.

Cc: Igor M. Liplianin <liplianin@netup.ru>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/media/video/cx23885/cx23885-cards.c

index 2354336862cf7f0d0f1203093295dae5fc77c423..934185cca758d7461e3bc96bead9f64db90625c0 100644 (file)
@@ -25,8 +25,8 @@
 #include <linux/delay.h>
 #include <media/cx25840.h>
 #include <linux/firmware.h>
-#include <staging/altera.h>
 
+#include "../../../staging/altera-stapl/altera.h"
 #include "cx23885.h"
 #include "tuner-xc2028.h"
 #include "netup-init.h"