From 480688c8dbf53bf0fe4d4f452bfe6ab2eeba0e9e Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 8 Jun 2011 09:18:32 -0700
Subject: [PATCH] --- yaml --- r: 253343 b: refs/heads/master c:
 e2d4dc5af36673e64e29973c974246eafe63548f h: refs/heads/master i:   253341:
 d09bb1c90c645f5e257af0832368660b99dc71c6   253339:
 155b2c153a994d816ca6327800dd428e29ee2899   253335:
 f6597537abf491358f226a6e8aae395585fc22f6   253327:
 8d113e6efa4beed4690a9032a0d15cadbffc2ec7   253311:
 c3c9423cb8242636da7feed00d8935c78e54a9af v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/video/cx23885/cx23885-cards.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 99964c058573..4b058052efb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53aebb5312c797e4b63fb50473a55ed054b3cb2f
+refs/heads/master: e2d4dc5af36673e64e29973c974246eafe63548f
diff --git a/trunk/drivers/media/video/cx23885/cx23885-cards.c b/trunk/drivers/media/video/cx23885/cx23885-cards.c
index 2354336862cf..934185cca758 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-cards.c
+++ b/trunk/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"