lkml.org 
[lkml]   [2010]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the usb tree with the v4l-dvb tree
    Hi Laurent,

    On Tue, 6 Jul 2010 10:18:20 +0200 Laurent Pinchart <laurent.pinchart@ideasonboard.com> 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.

    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2010-07-06 10:53    [W:0.041 / U:0.752 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site