diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-08 09:18:32 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-08 09:18:32 -0700 |
| commit | e2d4dc5af36673e64e29973c974246eafe63548f (patch) | |
| tree | c2b8a080c3e7fda300e8ddfaba94855be7decb9f | |
| parent | 53aebb5312c797e4b63fb50473a55ed054b3cb2f (diff) | |
| download | linux-3.10-e2d4dc5af36673e64e29973c974246eafe63548f.tar.gz linux-3.10-e2d4dc5af36673e64e29973c974246eafe63548f.tar.bz2 linux-3.10-e2d4dc5af36673e64e29973c974246eafe63548f.zip | |
Staging: cx23885: fix include of altera.h
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>
| -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 2354336862c..934185cca75 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 <staging/altera.h> +#include "../../../staging/altera-stapl/altera.h" #include "cx23885.h" #include "tuner-xc2028.h" #include "netup-init.h" |