Patchwork ETHOC: fix build breakage on s390

login
register
mail settings
Submitter Heiko Carstens
Date March 30, 2009, 9:30 a.m.
Message ID <20090330113015.21576898@osiris.boeblingen.de.ibm.com>
Download mbox | patch
Permalink /patch/25302/
State Accepted
Delegated to: David Miller
Headers show

Comments

Heiko Carstens - March 30, 2009, 9:30 a.m.
From: Heiko Carstens <heiko.carstens@de.ibm.com>

Let driver depend on HAS_IOMEM to avoid build breakage on s390:

  CC      drivers/net/ethoc.o
drivers/net/ethoc.c: In function 'ethoc_read':
drivers/net/ethoc.c:221: error: implicit declaration of function 'ioread32'
drivers/net/ethoc.c: In function 'ethoc_write':
drivers/net/ethoc.c:226: error: implicit declaration of function 'iowrite32'
drivers/net/ethoc.c: In function 'ethoc_rx':
drivers/net/ethoc.c:405: error: implicit declaration of function 'memcpy_fromio'
drivers/net/ethoc.c: In function 'ethoc_start_xmit':
drivers/net/ethoc.c:828: error: implicit declaration of function 'memcpy_toio'

Cc: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---
 drivers/net/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Thierry Reding - March 30, 2009, 11:52 a.m.
* Heiko Carstens wrote:
> From: Heiko Carstens <heiko.carstens@de.ibm.com>
> 
> Let driver depend on HAS_IOMEM to avoid build breakage on s390:
> 
>   CC      drivers/net/ethoc.o
> drivers/net/ethoc.c: In function 'ethoc_read':
> drivers/net/ethoc.c:221: error: implicit declaration of function 'ioread32'
> drivers/net/ethoc.c: In function 'ethoc_write':
> drivers/net/ethoc.c:226: error: implicit declaration of function 'iowrite32'
> drivers/net/ethoc.c: In function 'ethoc_rx':
> drivers/net/ethoc.c:405: error: implicit declaration of function 'memcpy_fromio'
> drivers/net/ethoc.c: In function 'ethoc_start_xmit':
> drivers/net/ethoc.c:828: error: implicit declaration of function 'memcpy_toio'
> 
> Cc: Thierry Reding <thierry.reding@avionic-design.de>
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
> ---
>  drivers/net/Kconfig |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux-2.6/drivers/net/Kconfig
> ===================================================================
> --- linux-2.6.orig/drivers/net/Kconfig
> +++ linux-2.6/drivers/net/Kconfig
> @@ -974,7 +974,7 @@ config ENC28J60_WRITEVERIFY
>  
>  config ETHOC
>  	tristate "OpenCores 10/100 Mbps Ethernet MAC support"
> -	depends on NET_ETHERNET
> +	depends on NET_ETHERNET && HAS_IOMEM
>  	select MII
>  	select PHYLIB
>  	help

Acked-by: Thierry Reding <thierry.reding@avionic-design.de>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - March 31, 2009, 9:41 p.m.
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Mon, 30 Mar 2009 13:52:02 +0200

> * Heiko Carstens wrote:
> > From: Heiko Carstens <heiko.carstens@de.ibm.com>
> > 
> > Let driver depend on HAS_IOMEM to avoid build breakage on s390:
> > 
> >   CC      drivers/net/ethoc.o
> > drivers/net/ethoc.c: In function 'ethoc_read':
 ...
> > Cc: Thierry Reding <thierry.reding@avionic-design.de>
> > Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
 ...
> Acked-by: Thierry Reding <thierry.reding@avionic-design.de>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: linux-2.6/drivers/net/Kconfig
===================================================================
--- linux-2.6.orig/drivers/net/Kconfig
+++ linux-2.6/drivers/net/Kconfig
@@ -974,7 +974,7 @@  config ENC28J60_WRITEVERIFY
 
 config ETHOC
 	tristate "OpenCores 10/100 Mbps Ethernet MAC support"
-	depends on NET_ETHERNET
+	depends on NET_ETHERNET && HAS_IOMEM
 	select MII
 	select PHYLIB
 	help