diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2014-02-06 17:54:02 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-02-06 17:54:02 +0900 |
| commit | c73c7ff8d5b1f4ee0bb9cd7c57c37782954b2246 (patch) | |
| tree | 0369df38eccd361f42ecc6830c0d75de2d41703d /arch/arm/mach-shmobile | |
| parent | d58922ce8cadba7e758608fef9438bc183b46b0f (diff) | |
| download | op-kernel-dev-c73c7ff8d5b1f4ee0bb9cd7c57c37782954b2246.zip op-kernel-dev-c73c7ff8d5b1f4ee0bb9cd7c57c37782954b2246.tar.gz | |
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>
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index bcbd74c..c431114 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 |
