On Thu, Jan 12, 2006 at 02:02:40AM +0100, Adrian Bunk wrote: > On Wed, Jan 11, 2006 at 04:21:35AM -0800, Andrew Morton wrote: > >... > > Changes since 2.6.15-mm2: > >... > > +gregkh-driver-add-tiocx-bus_type-probe-remove-methods.patch > >... > > driver tree updates > >... > > This patch caused the following compile error: > > <-- snip --> > > ... > CC arch/ia64/sn/kernel/tiocx.o > arch/ia64/sn/kernel/tiocx.c:151: error: 'cx_device_remove' undeclared here (not in a function) > make[2]: *** [arch/ia64/sn/kernel/tiocx.o] Error 1 > > <-- snip --> > > > Signed-off-by: Adrian Bunk <bunk@stusta.de> > > --- linux-2.6.15-mm3/arch/ia64/sn/kernel/tiocx.c.old 2006-01-12 01:58:20.000000000 +0100 > +++ linux-2.6.15-mm3/arch/ia64/sn/kernel/tiocx.c 2006-01-12 01:58:35.000000000 +0100 > @@ -148,7 +148,7 @@ > .match = tiocx_match, > .uevent = tiocx_uevent, > .probe = cx_device_probe, > - .remove = cx_device_remove, > + .remove = cx_driver_remove, > }; Thanks, I've merged it into the original patch now. greg k-h - To unsubscribe from this list: send the line "unsubscribe linux-ia64" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Fri Jan 13 03:45:53 2006
This archive was generated by hypermail 2.1.8 : 2006-01-13 03:46:00 EST