Merge branch 'master'

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

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 8b3403c..5dccac4 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -204,3 +204,6 @@ obj-$(CONFIG_IRDA) += irda/
 obj-$(CONFIG_ETRAX_ETHERNET) += cris/
 
 obj-$(CONFIG_NETCONSOLE) += netconsole.o
+
+obj-$(CONFIG_FS_ENET) += fs_enet/
+