Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / drivers / media / video / w9968cf_vpp.h

diff --git a/drivers/usb/media/w9968cf_vpp.h b/drivers/media/video/w9968cf_vpp.h
similarity index 98%
rename from drivers/usb/media/w9968cf_vpp.h
rename to drivers/media/video/w9968cf_vpp.h
index f3b91b7..88c9b6c 100644 (file)
--- a/drivers/usb/media/w9968cf_vpp.h
+++ b/drivers/media/video/w9968cf_vpp.h
@@ -29,7 +29,7 @@ struct w9968cf_vpp_t {
        struct module* owner;
        int (*check_headers)(const unsigned char*, const unsigned long);
        int (*decode)(const char*, const unsigned long, const unsigned,
-                     const unsigned, char*);
+                     const unsigned, char*);
        void (*swap_yuvbytes)(void*, unsigned long);
        void (*uyvy_to_rgbx)(u8*, unsigned long, u8*, u16, u8);
        void (*scale_up)(u8*, u8*, u16, u16, u16, u16, u16);