]> git.karo-electronics.de Git - linux-beck.git/commitdiff
net: mvneta: Only disable mvneta_bm for 64-bits
authorGregory CLEMENT <gregory.clement@free-electrons.com>
Thu, 1 Dec 2016 17:03:08 +0000 (18:03 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Dec 2016 18:52:01 +0000 (13:52 -0500)
Actually only the mvneta_bm support is not 64-bits compatible.
The mvneta code itself can run on 64-bits architecture.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: Marcin Wojtas <mw@semihalf.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/marvell/Kconfig

index 66fd9dbb2ca75d4c348e0b514b50ccd167b99775..2ccea9dd9248cebac40085704f31362c76e65b3a 100644 (file)
@@ -44,6 +44,7 @@ config MVMDIO
 config MVNETA_BM_ENABLE
        tristate "Marvell Armada 38x/XP network interface BM support"
        depends on MVNETA
+       depends on !64BIT
        ---help---
          This driver supports auxiliary block of the network
          interface units in the Marvell ARMADA XP and ARMADA 38x SoC
@@ -58,7 +59,6 @@ config MVNETA
        tristate "Marvell Armada 370/38x/XP network interface support"
        depends on PLAT_ORION || COMPILE_TEST
        depends on HAS_DMA
-       depends on !64BIT
        select MVMDIO
        select FIXED_PHY
        ---help---
@@ -71,6 +71,7 @@ config MVNETA
 
 config MVNETA_BM
        tristate
+       depends on !64BIT
        default y if MVNETA=y && MVNETA_BM_ENABLE!=n
        default MVNETA_BM_ENABLE
        select HWBM