Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / stmmac / Kconfig

diff --git a/drivers/net/stmmac/Kconfig b/drivers/net/stmmac/Kconfig
index eb63d44748a76cd3182e002284afe84296552d1e..7df7df4e79c5cef7b3f6e006a2150d21f882c101 100644 (file)
--- 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