From: Simon Horman Date: Thu, 6 Feb 2014 08:54:02 +0000 (+0900) Subject: Revert "ARM: shmobile: marzen: Conditionally select SMSC_PHY" X-Git-Tag: upstream/snapshot3+hdmi~770 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c905bad55aaa0812cb6589d6aef01aff2538e6a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Revert "ARM: shmobile: marzen: Conditionally select SMSC_PHY" This reverts commit 317af6612ee29dfcb5ae04df9c58e9f79fc8d4ff. This seems to prevent the board from booting now that the tree has been rebased on v3.14-rc1. Signed-off-by: Simon Horman (cherry picked from commit c73c7ff8d5b1f4ee0bb9cd7c57c37782954b2246) Signed-off-by: Simon Horman --- diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index eb25bb9..deb6dc8 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -250,7 +250,6 @@ config MACH_MARZEN depends on ARCH_R8A7779 select ARCH_REQUIRE_GPIOLIB select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SMSC_PHY if SMSC911X select USE_OF config MACH_MARZEN_REFERENCE @@ -258,7 +257,6 @@ config MACH_MARZEN_REFERENCE depends on ARCH_R8A7779 select ARCH_REQUIRE_GPIOLIB select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SMSC_PHY if SMSC911X select USE_OF ---help--- Use reference implementation of Marzen board support