Automatic merge of /spare/repo/netdev-2.6 branch starfire

[linux-2.6] / drivers / usb / media / pwc / pwc-ctrl.c

diff --git a/drivers/usb/media/pwc/pwc-ctrl.c b/drivers/usb/media/pwc/pwc-ctrl.c
index 3e1e4fe20d85a6ad7f2c8688dd7ca875bfc6b5ec..53099190952ce022338b7fad0df8c82c941bcbcd 100644 (file)
--- a/drivers/usb/media/pwc/pwc-ctrl.c
+++ b/drivers/usb/media/pwc/pwc-ctrl.c
@@ -48,8 +48,6 @@
 #include "pwc-uncompress.h"
 #include "pwc-kiara.h"
 #include "pwc-timon.h"
-#include "pwc-dec1.h"
-#include "pwc-dec23.h"
 
 /* Request types: video */
 #define SET_LUM_CTL                    0x01