Hi Dave,
On Thu, 20 Sep 2012 17:36:22 +1000 Stephen Rothwell <s...@canb.auug.org.au>
wrote:
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/net/ethernet/i825xx/znet.c: In function 'hardware_init':
> drivers/net/ethernet/i825xx/znet.c:868:2: error: implicit declaration of
> function 'isa_virt_to_bus' [-Werror=implicit-function-declaration]
>
> Caused by commit 1d3ff76759b7 ("i825xx: znet: fix compiler warnings when
> building a 64-bit kernel"). Is there some Kconfig dependency missing
> (CONFIG_ISA)?
>
> I have reverted that commit for today.
Today, I have added the following merge fix patch instead of reverting the
above (just until PowerPC can be fixed one way or the other). I don't
know if you want to put this into the net-next tree, but it may be a
reasonable temporary measure.
From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Fri, 21 Sep 2012 11:32:09 +1000
Subject: [PATCH] i825xx: znet: temporarily disable on PPC
due to build problems
Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
---
drivers/net/ethernet/i825xx/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/i825xx/Kconfig
b/drivers/net/ethernet/i825xx/Kconfig
index fed5080..9fce38b 100644
--- a/drivers/net/ethernet/i825xx/Kconfig
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -151,6 +151,7 @@ config SUN3_82586
config ZNET
tristate "Zenith Z-Note support (EXPERIMENTAL)"
depends on EXPERIMENTAL && ISA_DMA_API
+ depends on !PPC
---help---
The Zenith Z-Note notebook computer has a built-in network
(Ethernet) card, and this is the Linux driver for it. Note that the
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
pgpdoLLQvO0kM.pgp
Description: PGP signature
