Hi Stephen, On Tuesday 06 July 2010 10:51:32 Stephen Rothwell wrote: > On Tue, 6 Jul 2010 10:18:20 +0200 Laurent Pinchart wrote: > > > diff --cc include/linux/usb/video.h > > > index 2d5b7fc,429c91a..0000000 > > > --- a/include/linux/usb/video.h > > > +++ b/include/linux/usb/video.h > > > @@@ -160,12 -160,402 +160,409 @@@ > > > > [snip] > > > > > +/* 4.1.2. Control Capabilities */ > > > +#define UVC_CONTROL_CAP_GET (1 << 0) > > > +#define UVC_CONTROL_CAP_SET (1 << 1) > > > +#define UVC_CONTROL_CAP_DISABLED (1 << 2) > > > +#define UVC_CONTROL_CAP_AUTOUPDATE (1 << 3) > > > +#define UVC_CONTROL_CAP_ASYNCHRONOUS (1 << 4) > > > + > > > > Can you move those to the first part of the header file, with the other > > constants ? > > Sure, I just put it there because of the section numbering in the > comments. This, of course, will not influence how the file looks after > Linus merges it - unless the conflict is fixed up by one of the > maintainers before Linus gets it. I had the impression that the conflict resolutions in linux-next would end up in mainline. I must have been wrong, sorry. Mauro, can the uvc-gadget patches go through the linux-media tree ? -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
