Skip to content

Commit

Permalink
Revert "net: micrel: fix KS8851_MLL Kconfig"
Browse files Browse the repository at this point in the history
This reverts commit 1ff5359 which is
commit c3efced upstream.

The upstream commit c3efced ("net: micrel: fix KS8851_MLL Kconfig")
depends on e5f3155 ("ethernet: fix PTP_1588_CLOCK dependencies")
which is not part of Linux 5.10.y . Revert the aforementioned commit to
prevent breakage in 5.10.y .

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Sasha Levin <sashal@kernel.org>
Cc: <stable@vger.kernel.org> # 5.10.x
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Marek Vasut authored and Greg Kroah-Hartman committed Apr 27, 2022
1 parent 8bedbc8 commit 7992fdb
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/net/ethernet/micrel/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ config KS8851
config KS8851_MLL
tristate "Micrel KS8851 MLL"
depends on HAS_IOMEM
depends on PTP_1588_CLOCK_OPTIONAL
select MII
select CRC32
select EEPROM_93CX6
Expand Down

0 comments on commit 7992fdb

Please sign in to comment.