The following commit has been merged in the batman-adv/next branch: commit f07454fe2d6c233366a79aa13a638f69755745a5 Author: Mugunthan V N mugunthanvnm@ti.com Date: Mon Jul 30 10:17:13 2012 +0000
drivers: net: ethernet: cpsw: Add SOC dependency support for cpsw dependent modules
cpsw is dependent on davinci_cpdma and davinci_mdio, so adding SOC support for dependent modules
Signed-off-by: Mugunthan V N mugunthanvnm@ti.com Signed-off-by: David S. Miller davem@davemloft.net
diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig index 1b173a6..b26cbda 100644 --- a/drivers/net/ethernet/ti/Kconfig +++ b/drivers/net/ethernet/ti/Kconfig @@ -32,7 +32,7 @@ config TI_DAVINCI_EMAC
config TI_DAVINCI_MDIO tristate "TI DaVinci MDIO Support" - depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 ) + depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 || SOC_AM33XX ) select PHYLIB ---help--- This driver supports TI's DaVinci MDIO module. @@ -42,7 +42,7 @@ config TI_DAVINCI_MDIO
config TI_DAVINCI_CPDMA tristate "TI DaVinci CPDMA Support" - depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 ) + depends on ARM && ( ARCH_DAVINCI || ARCH_OMAP3 || SOC_AM33XX ) ---help--- This driver supports TI's DaVinci CPDMA dma engine.