cpsw: Merge cpsw modules to build as single driver
authorHebbar, Gururaja <gururaja.hebbar@ti.com>
Mon, 2 Jan 2012 11:23:08 +0000 (16:53 +0530)
committerVaibhav Hiremath <hvaibhav@ti.com>
Mon, 23 Jan 2012 19:14:44 +0000 (00:44 +0530)
Merge 2 cpsw drivers (cpsw_ale & cpsw) as one so as to avoid module
build issues.

Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
drivers/net/ethernet/ti/Makefile

index 42d2e5d7bcfbe182c52bbf2a59f728ad706291fe..91bd8bba78ffb872faa4b4f60cc43196e4893773 100644 (file)
@@ -7,4 +7,5 @@ obj-$(CONFIG_CPMAC) += cpmac.o
 obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
 obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
 obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o
-obj-$(CONFIG_TI_CPSW) += cpsw_ale.o cpsw.o
+obj-$(CONFIG_TI_CPSW) += ti_cpsw.o
+ti_cpsw-y := cpsw_ale.o cpsw.o