| From bedc61eb247902b7b27c6a5295bb598ea2e49320 Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Thu, 6 Feb 2014 17:54:02 +0900 |
| Subject: 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 <horms+renesas@verge.net.au> |
| (cherry picked from commit c73c7ff8d5b1f4ee0bb9cd7c57c37782954b2246) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/Kconfig | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index eb25bb9a5d4d..deb6dc884bf0 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 |
| -- |
| 2.1.2 |
| |
