spi: atmel: add missing spi_master_{resume,suspend} calls to PM callbacks

[~andy/linux] / drivers / net / ethernet / stmicro / stmmac / Kconfig

diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index 6e52c0f74cd9daad4ac5f80e1db98eec04958d55..e2f202e3932f518c78bc2c2febbe7efd32a39278 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -5,6 +5,7 @@ config STMMAC_ETH
        select PHYLIB
        select CRC32
        select PTP_1588_CLOCK
+       select RESET_CONTROLLER
        ---help---
          This is the driver for the Ethernet IPs are built around a
          Synopsys IP Core and only tested on the STMicroelectronics
@@ -25,6 +26,17 @@ config STMMAC_PLATFORM
 
          If unsure, say N.
 
+config DWMAC_SUNXI
+       bool "Allwinner GMAC support"
+       depends on STMMAC_PLATFORM && ARCH_SUNXI
+       default y
+       ---help---
+         Support for Allwinner A20/A31 GMAC ethernet controllers.
+
+         This selects Allwinner SoC glue layer support for the
+         stmmac device driver. This driver is used for A20/A31
+         GMAC    ethernet controller.
+
 config STMMAC_PCI
        bool "STMMAC PCI bus support"
        depends on STMMAC_ETH && PCI