diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2017-03-24 14:22:07 +0100 |
|---|---|---|
| committer | Bob Peterson <rpeterso@redhat.com> | 2017-04-03 15:08:58 +0200 |
| commit | c369898759e0e143a513d022121290370f001d01 (patch) | |
| tree | 5c770207fcec81a9fac2380821a7fad02cdd32e2 /drivers/net/ethernet/marvell/Kconfig | |
| parent | GFS2: Temporarily zero i_no_addr when creating a dinode (diff) | |
| parent | rhashtable: Add rhashtable_lookup_get_insert_fast (diff) | |
| download | linux-c369898759e0e143a513d022121290370f001d01.tar.xz linux-c369898759e0e143a513d022121290370f001d01.zip | |
Merge commit 'f9fe1c1' into for-next
Andreas Gruenbacher added function rhashtable_lookup_get_insert_fast
to rhashtable.h. That patch went into the net-next tree. In a
subsequent patch, GFS2 makes use of this new function. Therefore, we
needed a merge commit to make the new function available to GFS2.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'drivers/net/ethernet/marvell/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/marvell/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig index d2555e8b947e..da6fb825afea 100644 --- a/drivers/net/ethernet/marvell/Kconfig +++ b/drivers/net/ethernet/marvell/Kconfig @@ -82,13 +82,13 @@ config MVNETA_BM that all dependencies are met. config MVPP2 - tristate "Marvell Armada 375 network interface support" + tristate "Marvell Armada 375/7K/8K network interface support" depends on ARCH_MVEBU || COMPILE_TEST depends on HAS_DMA select MVMDIO ---help--- This driver supports the network interface units in the - Marvell ARMADA 375 SoC. + Marvell ARMADA 375, 7K and 8K SoCs. config PXA168_ETH tristate "Marvell pxa168 ethernet support" |