summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pwc/pwc-uncompress.h
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2006-04-25 19:26:46 -0500
committerMike Isely <isely@pobox.com>2006-04-25 19:26:46 -0500
commite362706b3e90987c5ca839def8372bff58fea7c0 (patch)
tree2c94262c383b9f881b278b9bfe0499231a7458ef /linux/drivers/media/video/pwc/pwc-uncompress.h
parent60f073ffa46dc14bcbc82b9c14ff5fb6cc2a5102 (diff)
parent682261e2c90d58868dd27ef1c524e327074a637d (diff)
downloadmediapointer-dvb-s2-e362706b3e90987c5ca839def8372bff58fea7c0.tar.gz
mediapointer-dvb-s2-e362706b3e90987c5ca839def8372bff58fea7c0.tar.bz2
Merge from master
From: Mike Isely <isely@pobox.com> Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc-uncompress.h')
-rw-r--r--linux/drivers/media/video/pwc/pwc-uncompress.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pwc/pwc-uncompress.h b/linux/drivers/media/video/pwc/pwc-uncompress.h
index f75e1b6cb..041227f65 100644
--- a/linux/drivers/media/video/pwc/pwc-uncompress.h
+++ b/linux/drivers/media/video/pwc/pwc-uncompress.h
@@ -1,5 +1,5 @@
/* (C) 1999-2003 Nemosoft Unv.
- (C) 2004 Luc Saillard (luc@saillard.org)
+ (C) 2004-2006 Luc Saillard (luc@saillard.org)
NOTE: this version of pwc is an unofficial (modified) release of pwc & pcwx
driver and thus may have bugs that are not present in the original version.
@@ -32,7 +32,7 @@
#include <linux/config.h>
-#include "pwc-ioctl.h"
+#include <media/pwc-ioctl.h>
/* from pwc-dec.h */
#define PWCX_FLAG_PLANAR 0x0001