From: Jean Delvare <khali@linux-fr.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: William Heimbigner <icxcnika@mar.tar.cc>,
linux-kernel@vger.kernel.org,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: Re: linux-2.6.21-rc7-mm2 fails to compile
Date: Fri, 27 Apr 2007 09:37:33 +0200 [thread overview]
Message-ID: <20070427093733.71013d73@hyperion.delvare> (raw)
In-Reply-To: <20070426175420.f2caae1a.akpm@linux-foundation.org>
On Thu, 26 Apr 2007 17:54:20 -0700, Andrew Morton wrote:
> On Fri, 27 Apr 2007 00:00:15 +0000 (GMT) William Heimbigner <icxcnika@mar.tar.cc> 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
prev parent reply other threads:[~2007-04-27 7:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-27 0:00 linux-2.6.21-rc7-mm2 fails to compile William Heimbigner
2007-04-27 0:54 ` Andrew Morton
2007-04-27 1:17 ` Randy Dunlap
2007-04-27 7:37 ` Jean Delvare [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070427093733.71013d73@hyperion.delvare \
--to=khali@linux-fr.org \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=icxcnika@mar.tar.cc \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox