aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/media/pwc/pwc-uncompress.c
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-06-02 18:43:09 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-02 18:43:09 -0400
commitd7aaf48128ec7fcefcee92ea22833afc1a80e268 (patch)
tree16ff78f6be6a5519944bb7bfc6034dfbd71ae97f /drivers/usb/media/pwc/pwc-uncompress.c
parentdecc6d0b68f27bbb8a0357fccf41936a3c196b03 (diff)
parent1e86d1c648508fd50e6c9960576b87906a7906ad (diff)
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'drivers/usb/media/pwc/pwc-uncompress.c')
-rw-r--r--drivers/usb/media/pwc/pwc-uncompress.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/media/pwc/pwc-uncompress.c b/drivers/usb/media/pwc/pwc-uncompress.c
index c596083f06b..bc3b1635eab 100644
--- a/drivers/usb/media/pwc/pwc-uncompress.c
+++ b/drivers/usb/media/pwc/pwc-uncompress.c
@@ -29,8 +29,6 @@
#include "pwc.h"
#include "pwc-uncompress.h"
-#include "pwc-dec1.h"
-#include "pwc-dec23.h"
int pwc_decompress(struct pwc_device *pdev)
{