summaryrefslogtreecommitdiffstats
path: root/drivers/phy
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-17 11:14:34 +0100
committerArnd Bergmann <arnd@arndb.de>2014-03-17 11:14:34 +0100
commitcda88c8be59128da05d7cd58f9ce2754a1416516 (patch)
treeb0af393c68b3d53fcdb100b8cb07af884bd3d4d5 /drivers/phy
parentde65ded49e95dbbd685b613a615f6821868e5b33 (diff)
parent200c0a3e404beab02be83e5cbf111d26b9f6ce22 (diff)
downloadlinux-cda88c8be59128da05d7cd58f9ce2754a1416516.tar.bz2
Merge tag 'mvebu-drivers-3.15-2' of git://git.infradead.org/linux-mvebu into next/drivers
Merge "mvebu drivers for v3.15" from Jason Cooper: pull request #1: - mvebu mbus - use of_find_matching_node_and_match - rtc - use PTR_ERR_OR_ZERO in isl12057 - work around issue in mv where date returned is 2038 - kirkwood -> mach-mvebu - various Kconfig oneliners to allow building kirkwood in -mvebu/ pull request #2: - reset - re-use qnap-poweroff driver for Synology NASs * tag 'mvebu-drivers-3.15-2' of git://git.infradead.org/linux-mvebu: Power: Reset: Generalize qnap-poweroff to work on Synology devices. drivers: Enable building of Kirkwood drivers for mach-mvebu rtc: mv: reset date if after year 2038 rtc: isl12057: use PTR_ERR_OR_ZERO to fix coccinelle warnings bus: mvebu-mbus: make use of of_find_matching_node_and_match Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/phy')
-rw-r--r--drivers/phy/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index afa2354f6600..5e6b33f9c294 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -24,7 +24,7 @@ config PHY_EXYNOS_MIPI_VIDEO
config PHY_MVEBU_SATA
def_bool y
- depends on ARCH_KIRKWOOD || ARCH_DOVE
+ depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD
depends on OF
select GENERIC_PHY