Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[linux-2.6] / drivers / net / Makefile

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 9a86ebf9ab7735ce26e9c4dce9f3bba91b87b58d..0878e3df51746e74c4302190535173e36ae4d23b 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -195,6 +195,7 @@ obj-$(CONFIG_SMC91X) += smc91x.o
 obj-$(CONFIG_SMC911X) += smc911x.o
 obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_FEC_8XX) += fec_8xx/
+obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
 
 obj-$(CONFIG_MACB) += macb.o