On 4/25/22 14:48, Marek Vasut wrote:
> This reverts commit 1ff5359afa5ec0dd09fe76183dc4fa24b50e4125.
>
> 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 5.10.y . Revert the aforementioned commit to
> prevent breakage in 5.10.y .
>
> Signed-off-by: Marek Vasut <marex@xxxxxxx>
> Cc: David S. Miller <davem@xxxxxxxxxxxxx>
> Cc: Jakub Kicinski <kuba@xxxxxxxxxx>
> Cc: Paolo Abeni <pabeni@xxxxxxxxxx>
> Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
> Cc: Sasha Levin <sashal@xxxxxxxxxx>
> Cc: <stable@xxxxxxxxxxxxxxx> # 5.10.x
Ack. Thanks.
> ---
> drivers/net/ethernet/micrel/Kconfig | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/micrel/Kconfig b/drivers/net/ethernet/micrel/Kconfig
> index 9ceb7e1fb169..42bc014136fe 100644
> --- a/drivers/net/ethernet/micrel/Kconfig
> +++ b/drivers/net/ethernet/micrel/Kconfig
> @@ -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
--
~Randy
