X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Fusbvideo%2Fultracam.c;fp=drivers%2Fusb%2Fmedia%2Fultracam.c;h=10c58b4a2e5b159195fc64f4e6293626603a0421;hb=a2f44b27303a5353859d77a3e96a1d3f33f56ab7;hp=75ff755224df603e2aee7a3f27de5a5fd79215a2;hpb=134734d875a0a48d994ef20b9905209b4b8b6f75;p=linux-2.6.git 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 75ff75522..10c58b4a2 100644 --- 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))