| From marex@denx.de Tue Apr 26 09:09:57 2022 |
| From: Marek Vasut <marex@denx.de> |
| Date: Mon, 25 Apr 2022 23:48:59 +0200 |
| Subject: Revert "net: micrel: fix KS8851_MLL Kconfig" |
| To: stable@vger.kernel.org |
| Cc: Marek Vasut <marex@denx.de>, "David S . Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Randy Dunlap <rdunlap@infradead.org>, Sasha Levin <sashal@kernel.org> |
| Message-ID: <20220425214859.256650-1-marex@denx.de> |
| |
| From: Marek Vasut <marex@denx.de> |
| |
| This reverts commit 4cd3c9e070d6a9a9dc76a5ffa79114953bf69087 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 5.4.y . Revert the aforementioned commit to |
| prevent breakage in 5.4.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 | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| --- 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 |
| ---help--- |
| This platform driver is for Micrel KS8851 Address/data bus |
