Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/stmmac/Kconfig b/drivers/net/stmmac/Kconfig
index eb63d44748a7..7df7df4e79c5 100644
--- a/drivers/net/stmmac/Kconfig
+++ b/drivers/net/stmmac/Kconfig
@@ -3,10 +3,10 @@ config STMMAC_ETH
         select MII
         select PHYLIB
         select CRC32
-        depends on NETDEVICES && CPU_SUBTYPE_ST40
+        depends on NETDEVICES && HAS_IOMEM
         help
           This is the driver for the Ethernet IPs are built around a
-          Synopsys IP Core and fully tested on the STMicroelectronics
+          Synopsys IP Core and only tested on the STMicroelectronics
           platforms.
 
 if STMMAC_ETH
@@ -32,6 +32,7 @@ config STMMAC_DUAL_MAC
 config STMMAC_TIMER
         bool "STMMAC Timer optimisation"
         default n
+        depends on RTC_HCTOSYS_DEVICE
         help
           Use an external timer for mitigating the number of network
           interrupts. Currently, for SH architectures, it is possible