Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / drivers / net / ethernet / stmicro / stmmac / Kconfig

diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index 54de17529c9740e3bb144caa15d1f0ae0ccdbd87..3818c5e06ebac5099f8051c813222349a2f6a6a5 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -104,6 +104,18 @@ config DWMAC_STI
          device driver. This driver is used on for the STi series
          SOCs GMAC ethernet controller.
 
+config DWMAC_STM32
+       tristate "STM32 DWMAC support"
+       default ARCH_STM32
+       depends on OF && HAS_IOMEM
+       select MFD_SYSCON
+       ---help---
+         Support for ethernet controller on STM32 SOCs.
+
+         This selects STM32 SoC glue layer support for the stmmac
+         device driver. This driver is used on for the STM32 series
+         SOCs GMAC ethernet controller.
+
 config DWMAC_SUNXI
        tristate "Allwinner GMAC support"
        default ARCH_SUNXI