Merge branch 'master' into upstream

[safe/jmp/linux-2.6] / drivers / net / phy / Makefile

diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index d961413..bcd1efb 100644 (file)
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -9,3 +9,6 @@ obj-$(CONFIG_CICADA_PHY)        += cicada.o
 obj-$(CONFIG_LXT_PHY)          += lxt.o
 obj-$(CONFIG_QSEMI_PHY)                += qsemi.o
 obj-$(CONFIG_SMSC_PHY)         += smsc.o
+obj-$(CONFIG_VITESSE_PHY)      += vitesse.o
+obj-$(CONFIG_BROADCOM_PHY)     += broadcom.o
+obj-$(CONFIG_FIXED_PHY)                += fixed.o