[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20110426.124354.71125507.davem@davemloft.net>
Date: Tue, 26 Apr 2011 12:43:54 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: sfr@...b.auug.org.au
Cc: netdev@...r.kernel.org, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org, hayeswang@...ltek.com,
romieu@...zoreil.com
Subject: Re: linux-next: build failure after merge of the net tree
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 26 Apr 2011 13:51:46 +1000
> Hi all,
>
> After merging the net tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/net/r8169.c: In function 'rtl8168e_1_hw_phy_config':
> drivers/net/r8169.c:2578: error: too many arguments to function 'rtl_apply_firmware'
> drivers/net/r8169.c:2578: error: void value not ignored as it ought to be
> drivers/net/r8169.c: In function 'rtl8168e_2_hw_phy_config':
> drivers/net/r8169.c:2586: error: too many arguments to function 'rtl_apply_firmware'
> drivers/net/r8169.c:2586: error: void value not ignored as it ought to be
>
> Caused by commit 953a12cc2889 ("r8169: don't request firmware when
> there's no userspace") from the net-current tree interacting with commit
> 01dc7fec4025 ("net/r8169: support RTL8168E").
>
> I applied the following fixup patch:
Stephen, I just merged net-2.6 into net-next-2.6 and added your patch
to the merge commit to make sure the build is fine.
Thanks a lot!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists