Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / drivers / net / ethernet / ti / Kconfig

diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig
index bb126be1eb72530e4d99a9ba400eb29c352184c7..8b21b40a9fe5193298c3086d3867609a3eb58f12 100644 (file)
--- a/drivers/net/ethernet/ti/Kconfig
+++ b/drivers/net/ethernet/ti/Kconfig
@@ -49,10 +49,11 @@ config TI_DAVINCI_CPDMA
          will be called davinci_cpdma.  This is recommended.
 
 config TI_CPSW_PHY_SEL
-       bool
+       bool "TI CPSW Phy mode Selection (DEPRECATED)"
+       default n
        ---help---
          This driver supports configuring of the phy mode connected to
-         the CPSW.
+         the CPSW. DEPRECATED: use PHY_TI_GMII_SEL.
 
 config TI_CPSW_ALE
        tristate "TI CPSW ALE Support"
@@ -64,7 +65,6 @@ config TI_CPSW
        depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST
        select TI_DAVINCI_CPDMA
        select TI_DAVINCI_MDIO
-       select TI_CPSW_PHY_SEL
        select TI_CPSW_ALE
        select MFD_SYSCON
        select REGMAP