Revert "net: micrel: fix KS8851_MLL Kconfig"
authorMarek Vasut <marex@denx.de>
Mon, 25 Apr 2022 21:48:59 +0000 (23:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 27 Apr 2022 11:15:32 +0000 (13:15 +0200)
This reverts commit 84ddee4ea320411fa038d4f1fd9a0161f989b482 which is
commit c3efcedd272aa6dd5929e20cf902a52ddaa1197a upstream.

The upstream commit c3efcedd272a ("net: micrel: fix KS8851_MLL Kconfig")
depends on e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies")
which is not part of Linux 4.14.y . Revert the aforementioned commit to
prevent breakage in 4.14.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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/micrel/Kconfig

index aa12bace8673eab93e23b93ed73bbaf7a62c0757..b7e2f49696b74b2e29ce04bd54e96ccc46439ec7 100644 (file)
@@ -45,7 +45,6 @@ config KS8851
 config KS8851_MLL
        tristate "Micrel KS8851 MLL"
        depends on HAS_IOMEM
-       depends on PTP_1588_CLOCK_OPTIONAL
        select MII
        ---help---
          This platform driver is for Micrel KS8851 Address/data bus