Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6] / drivers / net / wan / Makefile

diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index 83ec2c87ba3f34fea00937247f9e4e64bce65c67..102549605d098681a26db81af6a393ea5476fdc9 100644 (file)
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
@@ -21,12 +21,11 @@ pc300-y                             := pc300_drv.o
 pc300-$(CONFIG_PC300_MLPPP)    += pc300_tty.o
 pc300-objs                     := $(pc300-y)
 
-obj-$(CONFIG_HOSTESS_SV11)     += z85230.o     syncppp.o       hostess_sv11.o
-obj-$(CONFIG_SEALEVEL_4021)    += z85230.o     syncppp.o       sealevel.o
-obj-$(CONFIG_COSA)             +=              syncppp.o       cosa.o
-obj-$(CONFIG_FARSYNC)          +=              syncppp.o       farsync.o
-obj-$(CONFIG_DSCC4)             +=                             dscc4.o
-obj-$(CONFIG_LANMEDIA)         +=              syncppp.o
+obj-$(CONFIG_HOSTESS_SV11)     += z85230.o     hostess_sv11.o
+obj-$(CONFIG_SEALEVEL_4021)    += z85230.o     sealevel.o
+obj-$(CONFIG_COSA)             += cosa.o
+obj-$(CONFIG_FARSYNC)          += farsync.o
+obj-$(CONFIG_DSCC4)             += dscc4.o
 obj-$(CONFIG_X25_ASY)          += x25_asy.o
 
 obj-$(CONFIG_LANMEDIA)         += lmc/
@@ -41,6 +40,7 @@ obj-$(CONFIG_N2)              += n2.o
 obj-$(CONFIG_C101)             += c101.o
 obj-$(CONFIG_WANXL)            += wanxl.o
 obj-$(CONFIG_PCI200SYN)                += pci200syn.o
+obj-$(CONFIG_PC300TOO)         += pc300too.o
 
 clean-files := wanxlfw.inc
 $(obj)/wanxl.o:        $(obj)/wanxlfw.inc