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

[linux-2.6.git] / drivers / media / video / usbvideo / ultracam.c

diff --git a/drivers/usb/media/ultracam.c b/drivers/media/video/usbvideo/ultracam.c
similarity index 99%
rename from drivers/usb/media/ultracam.c
rename to drivers/media/video/usbvideo/ultracam.c
index 75ff755..10c58b4 100644 (file)
--- a/drivers/usb/media/ultracam.c
+++ b/drivers/media/video/usbvideo/ultracam.c
@@ -23,7 +23,7 @@
 typedef struct {
        int initialized;        /* Had we already sent init sequence? */
        int camera_model;       /* What type of IBM camera we got? */
-        int has_hdr;
+       int has_hdr;
 } ultracam_t;
 #define        ULTRACAM_T(uvd) ((ultracam_t *)((uvd)->user_data))