On Thu, 26 Apr 2007 17:54:20 -0700, Andrew Morton wrote:
> On Fri, 27 Apr 2007 00:00:15 +0000 (GMT) William Heimbigner <[EMAIL
> PROTECTED]> wrote:
>
> > Output leading up to the error:
> >
> > CC drivers/macintosh/macio-adb.o
> > LD drivers/macintosh/built-in.o
> > CC [M] drivers/macintosh/apm_emu.o
> > CC [M] drivers/macintosh/therm_windtunnel.o
> > drivers/macintosh/therm_windtunnel.c: In function 'therm_of_remove':
> > drivers/macintosh/therm_windtunnel.c:462: error: void value not ignored as
> > it
> > ought to be
> > drivers/macintosh/therm_windtunnel.c:463: warning: control reaches end of
> > non-void function
> > make[2]: *** [drivers/macintosh/therm_windtunnel.o] Error 1
> > make[1]: *** [drivers/macintosh] Error 2
> > make: *** [drivers] Error 2
> >
> > This is on an iMac G3 powerpc.
>
> i2c_del_driver() was changed to reutrn void in the i2c tree.
>
> ---
> a/drivers/macintosh/therm_windtunnel.c~fix-jdelvare-i2c-i2c-del-driver-returns-void-on-powerpc
> +++ a/drivers/macintosh/therm_windtunnel.c
> @@ -459,7 +459,8 @@ therm_of_probe( struct of_device *dev, c
> static int
> therm_of_remove( struct of_device *dev )
> {
> - return i2c_del_driver( &g4fan_driver );
> + i2c_del_driver( &g4fan_driver );
> + return 0;
> }
>
> static struct of_device_id therm_of_match[] = {{
> _
Sorry for the trouble and thanks for reporting. I've merged the fix
above in the original patch now.
--
Jean Delvare
-
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/
