Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

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

diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig
index ca37fb200a4457353adffda5db5263f45a5ccf25..f6a71092e1359ea095aad0aeca093065080ceb5c 100644 (file)
--- a/drivers/net/ethernet/ti/Kconfig
+++ b/drivers/net/ethernet/ti/Kconfig
@@ -56,12 +56,18 @@ config TI_CPSW_PHY_SEL
          This driver supports configuring of the phy mode connected to
          the CPSW.
 
+config TI_CPSW_ALE
+       tristate "TI CPSW ALE Support"
+       ---help---
+         This driver supports TI's CPSW ALE module.
+
 config TI_CPSW
        tristate "TI CPSW Switch Support"
        depends on ARCH_DAVINCI || ARCH_OMAP2PLUS
        select TI_DAVINCI_CPDMA
        select TI_DAVINCI_MDIO
        select TI_CPSW_PHY_SEL
+       select TI_CPSW_ALE
        select MFD_SYSCON
        select REGMAP
        ---help---
@@ -79,6 +85,25 @@ config TI_CPTS
          the CPSW Ethernet Switch. The unit can time stamp PTP UDP/IPv4
          and Layer 2 packets, and the driver offers a PTP Hardware Clock.
 
+config TI_KEYSTONE_NETCP
+       tristate "TI Keystone NETCP Core Support"
+       select TI_CPSW_ALE
+       depends on OF
+       depends on KEYSTONE_NAVIGATOR_DMA && KEYSTONE_NAVIGATOR_QMSS
+       ---help---
+         This driver supports TI's Keystone NETCP Core.
+
+         To compile this driver as a module, choose M here: the module
+         will be called keystone_netcp.
+
+config TI_KEYSTONE_NETCP_ETHSS
+       depends on TI_KEYSTONE_NETCP
+       tristate "TI Keystone NETCP Ethernet subsystem Support"
+       ---help---
+
+         To compile this driver as a module, choose M here: the module
+         will be called keystone_netcp_ethss.
+
 config TLAN
        tristate "TI ThunderLAN support"
        depends on (PCI || EISA)