diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
| commit | d932cb7e630cae3b6b5307b767d296ff1a597c5e (patch) | |
| tree | f930d068a12a256fabef0864bcdf8e85f095369e /drivers/net/wan/Makefile | |
| parent | 73b59a3b1c09e4bfc678400b77b96134dcfbf112 (diff) | |
| parent | f5d635f649607b09b0b4620d25d028fd2b1b7ea5 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/net/wan/Makefile')
| -rw-r--r-- | drivers/net/wan/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile index 823c6d5ab90d..316ca6869d5e 100644 --- a/drivers/net/wan/Makefile +++ b/drivers/net/wan/Makefile | |||
| @@ -28,7 +28,6 @@ obj-$(CONFIG_COSA) += syncppp.o cosa.o | |||
| 28 | obj-$(CONFIG_FARSYNC) += syncppp.o farsync.o | 28 | obj-$(CONFIG_FARSYNC) += syncppp.o farsync.o |
| 29 | obj-$(CONFIG_DSCC4) += dscc4.o | 29 | obj-$(CONFIG_DSCC4) += dscc4.o |
| 30 | obj-$(CONFIG_LANMEDIA) += syncppp.o | 30 | obj-$(CONFIG_LANMEDIA) += syncppp.o |
| 31 | obj-$(CONFIG_SYNCLINK_SYNCPPP) += syncppp.o | ||
| 32 | obj-$(CONFIG_X25_ASY) += x25_asy.o | 31 | obj-$(CONFIG_X25_ASY) += x25_asy.o |
| 33 | 32 | ||
| 34 | obj-$(CONFIG_LANMEDIA) += lmc/ | 33 | obj-$(CONFIG_LANMEDIA) += lmc/ |