lkml.org 
[lkml]   [2012]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    SubjectRe: linux-next: build failure after merge of the final tree (net-next tree related)
    From
    From: Stephen Rothwell <sfr@canb.auug.org.au>
    Date: Tue, 10 Apr 2012 15:29:23 +1000

    > After merging the final tree, today's linux-next build (s390 allmodconfig)
    > failed like this:

    I just checked in the following which will hopefully cure this,
    thanks:

    --------------------
    wiznet: Fix Kconfig dependencies.

    Both drivers need to depend upon HAS_IOMEM, otherwise we
    get a build failure on platforms like S390.

    All the driver specific config options need to depend upon
    the drivers themselves.

    Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    ---
    drivers/net/ethernet/wiznet/Kconfig | 4 ++++
    1 files changed, 4 insertions(+), 0 deletions(-)

    diff --git a/drivers/net/ethernet/wiznet/Kconfig b/drivers/net/ethernet/wiznet/Kconfig
    index 2bb383c..c8291bf 100644
    --- a/drivers/net/ethernet/wiznet/Kconfig
    +++ b/drivers/net/ethernet/wiznet/Kconfig
    @@ -19,6 +19,7 @@ if NET_VENDOR_WIZNET

    config WIZNET_W5100
    tristate "WIZnet W5100 Ethernet support"
    + depends on HAS_IOMEM
    ---help---
    Support for WIZnet W5100 chips.

    @@ -31,6 +32,7 @@ config WIZNET_W5100

    config WIZNET_W5300
    tristate "WIZnet W5300 Ethernet support"
    + depends on HAS_IOMEM
    ---help---
    Support for WIZnet W5300 chips.

    @@ -43,6 +45,7 @@ config WIZNET_W5300

    choice
    prompt "WIZnet interface mode"
    + depends on WIZNET_W5100 || WIZNET_W5300
    default WIZNET_BUS_ANY

    config WIZNET_BUS_DIRECT
    @@ -69,6 +72,7 @@ endchoice

    config WIZNET_TX_FLOW
    bool "Use transmit flow control"
    + depends on WIZNET_W5100 || WIZNET_W5300
    default y
    help
    This enables transmit flow control for WIZnet chips.
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-04-10 15:31    [W:0.020 / U:32.040 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site