Messages in this thread | | | Date | Thu, 17 Jun 2010 15:03:25 -0700 | From | Greg KH <> | Subject | Re: [PATCH] Remove Hayes ESP ioctls |
| |
On Thu, Jun 17, 2010 at 05:29:36PM -0400, Jeff Dike wrote: > On Thu, Jun 17, 2010 at 10:41:05PM +0200, Arnd Bergmann wrote: > > On Thursday 17 June 2010 22:14:17 Greg KH wrote: > > > --- a/include/asm-generic/ioctls.h > > > +++ b/include/asm-generic/ioctls.h > > > @@ -87,12 +87,10 @@ > > > #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ > > > > > > /* > > > - * some architectures define FIOQSIZE as 0x545E, which is used for > > > - * TIOCGHAYESESP on others > > > + * Some arches already define FIOQSIZE due to a historical > > > + * conflict with a Hayes modem-specific ioctl value. > > > */ > > > #ifndef FIOQSIZE > > > -# define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ > > > -# define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ > > > # define FIOQSIZE 0x5460 > > > #endif > > > > Yes, that looks right. I had introduced the #ifdef originally, but > > did not look closely enough at the patch now. > > > > Arnd > > > > That's better. I had figured that the whole block was due to the driver, > and therefore could be nuked.
Next time you might want to build your patches :)
thanks,
greg k-h
| |