Hrm... looks like that bit might have slipped through improperly. As the comment says, it was needed for 2.4.9 -- I think someone's tree must still have that (improperly) and it just got caught in the patch.
I'll remove it from our tree.
Matt
On Mon, Feb 25, 2002 at 09:51:14AM -0800, Greg KH wrote:
> On Sun, Feb 24, 2002 at 07:33:18PM -0800, Matthew Dharm wrote:
> > Greg et al --
> >
> > Attached to this message is a patch for usb-storage against 2.4.18-rc4.
> > Please apply. Greg, it should also be applied to 2.5.x, but I don't have a
> > good patch against that version. So, if you want to try to make it go,
> > feel free, but I won't complain if you don't. Actually, I might complain a
> > little bit.. :)
>
> I'll only apply it to the 2.4 tree :)
>
> But I do have one question:
>
> > diff -u -X ../dontdiff drivers/usb/storage.old/usb.h drivers/usb/storage/usb.h
> > --- drivers/usb/storage.old/usb.h Thu Nov 22 11:49:34 2001
> > +++ drivers/usb/storage/usb.h Sun Feb 24 18:49:10 2002
> > @@ -1,7 +1,7 @@
> > /* Driver for USB Mass Storage compliant devices
> > * Main Header File
> > *
> > - * $Id: usb.h,v 1.18 2001/07/30 00:27:59 mdharm Exp $
> > + * $Id: usb.h,v 1.19 2002/02/25 00:40:13 mdharm Exp $
> > *
> > * Current development and maintenance by:
> > * (c) 1999, 2000 Matthew Dharm ([EMAIL PROTECTED])
> > @@ -188,4 +188,17 @@
> > /* Function to fill an inquiry response. See usb.c for details */
> > extern void fill_inquiry_response(struct us_data *us,
> > unsigned char *data, unsigned int data_len);
> > +
> > +/*
> > + * This macro is used in datafab.c and jumpshot.c, but not defined in
> > + * the 2.4.9 include files anywhere.
> > + */
> > +#ifndef min_t
> > +#define min_t(type, a, b) (min_ ## type (a, b))
> > +static inline int min_int(int a, int b)
> > +{
> > + return (a < b ? a : b);
> > +}
> > +#endif
> > +
> > #endif
>
> What's this patch for? It isn't needed by anything else you changed,
> and isn't needed for the kernel, as it has a "builtin" min() function
> now.
>
> thanks,
>
> greg k-h
>
>
> _______________________________________________
> [EMAIL PROTECTED]
> To unsubscribe, use the last form field at:
> https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
--
Matthew Dharm Home: [EMAIL PROTECTED]
Maintainer, Linux USB Mass Storage Driver
C: They kicked your ass, didn't they?
S: They were cheating!
-- The Chief and Stef
User Friendly, 11/19/1997
msg04827/pgp00000.pgp
Description: PGP signature
