On Thu, Jan 20, 2005 at 11:48:26AM +0300, Evgeniy Polyakov wrote:
> On Wed, 2005-01-19 at 15:05 -0800, Greg KH wrote:
> > On Thu, Jan 13, 2005 at 01:15:19AM +0300, Evgeniy Polyakov wrote:
> > > --- include/linux/connector.h~    2005-01-13 00:21:55.000000000 +0300
> > > +++ include/linux/connector.h     2005-01-13 00:53:21.000000000 +0300
> > > @@ -24,6 +24,9 @@
> > >  
> > >  #include <asm/types.h>
> > >  
> > > +#define CONN_IDX_KOBJECT_UEVENT          0xabcd
> > > +#define CONN_VAL_KOBJECT_UEVENT          0x0000
> > > +
> > >  #define CONNECTOR_MAX_MSG_SIZE   1024
> > >  
> > >  struct cb_id
> > > --- linux-2.6/drivers/connector/connector.c.orig  2005-01-13 
> > > 00:21:23.000000000 +0300
> > > +++ linux-2.6/drivers/connector/connector.c       2005-01-13 
> > > 00:32:48.000000000 +0300
> > > @@ -46,6 +46,8 @@
> > >  
> > >  static struct cn_dev cdev;
> > >  
> > > +int cn_already_initialized = 0;
> > 
> > <snip>
> > 
> > Hm, this patch needs to be rediffed, now that I've accepted the
> > connector code, right?  The connector.c change seems to already be in
> > your last connector patch, and the .h change is there with a different
> > #define spelling, causing the uevent code to need to be changed.
> > 
> > Care to redo it?
> 
> Sure. Patch attached. 

Applied, thanks.

greg k-h
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to