[PATCH] dsa: fix compile bug on s390

[PATCH] dsa: fix compile bug on s390

[Heiko Carstens]

From: Heiko Carstens <heiko.carstens@de.ibm.com>

git commit 45cec1bac0719c904bb5f4405c2937f7e715888c
"dsa: Need to select PHYLIB." causes this build bug on s390:

drivers/built-in.o: In function `phy_stop_interrupts':
/home/heicarst/linux-2.6/drivers/net/phy/phy.c:631: undefined reference to `free_irq'
/home/heicarst/linux-2.6/drivers/net/phy/phy.c:646: undefined reference to `enable_irq'
drivers/built-in.o: In function `phy_start_interrupts':
/home/heicarst/linux-2.6/drivers/net/phy/phy.c:601: undefined reference to `request_irq'
drivers/built-in.o: In function `phy_interrupt':
/home/heicarst/linux-2.6/drivers/net/phy/phy.c:528: undefined reference to `disable_irq_nosync'
drivers/built-in.o: In function `phy_change':
/home/heicarst/linux-2.6/drivers/net/phy/phy.c:674: undefined reference to `enable_irq'
/home/heicarst/linux-2.6/drivers/net/phy/phy.c:692: undefined reference to `disable_irq'

PHYLIB has alread a depend on !S390, however select PHYLIB at DSA overrides
that unfortunately. So add a depend on !S390 to DSA as well.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---

 net/dsa/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/net/dsa/Kconfig
===================================================================
--- linux-2.6.orig/net/dsa/Kconfig
+++ linux-2.6/net/dsa/Kconfig
@@ -1,7 +1,7 @@
 menuconfig NET_DSA
 	bool "Distributed Switch Architecture support"
 	default n
-	depends on EXPERIMENTAL
+	depends on EXPERIMENTAL && !S390
 	select PHYLIB
 	---help---
 	  This allows you to use hardware switch chips that use

Re: [PATCH] dsa: fix compile bug on s390

[David Miller]

From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 13 Oct 2008 11:04:18 +0200

> From: Heiko Carstens <heiko.carstens@de.ibm.com>
> 
> git commit 45cec1bac0719c904bb5f4405c2937f7e715888c
> "dsa: Need to select PHYLIB." causes this build bug on s390:
> 
> drivers/built-in.o: In function `phy_stop_interrupts':
> /home/heicarst/linux-2.6/drivers/net/phy/phy.c:631: undefined reference to `free_irq'
> /home/heicarst/linux-2.6/drivers/net/phy/phy.c:646: undefined reference to `enable_irq'
> drivers/built-in.o: In function `phy_start_interrupts':
> /home/heicarst/linux-2.6/drivers/net/phy/phy.c:601: undefined reference to `request_irq'
> drivers/built-in.o: In function `phy_interrupt':
> /home/heicarst/linux-2.6/drivers/net/phy/phy.c:528: undefined reference to `disable_irq_nosync'
> drivers/built-in.o: In function `phy_change':
> /home/heicarst/linux-2.6/drivers/net/phy/phy.c:674: undefined reference to `enable_irq'
> /home/heicarst/linux-2.6/drivers/net/phy/phy.c:692: undefined reference to `disable_irq'
> 
> PHYLIB has alread a depend on !S390, however select PHYLIB at DSA overrides
> that unfortunately. So add a depend on !S390 to DSA as well.
> 
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

Applied.

It's not pretty but the alternatives aren't any better.

I wonder if we should instead make PHYLIB a dependency here, but
that of course exposes implementation details to the user that
they shouldn't need to be concerned about when they want to
enable a certain feature.