diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:51:24 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:51:24 -0500 |
| commit | 3b621ee5df437d3f332a635ab6421aaa61a7dc2b (patch) | |
| tree | c4a5236cee8eb7418770802313d36a55f1cc0b1e /drivers/net/Makefile | |
| parent | 7211bb9b64f17b23834d91fc3d0c1d78671ee9a8 (diff) | |
| parent | 5e04e7fe774794b837e1d3897e6b96ae2d06679a (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 5dccac434d48..27822a2f0683 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -113,6 +113,7 @@ obj-$(CONFIG_PPP_ASYNC) += ppp_async.o | |||
| 113 | obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o | 113 | obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o |
| 114 | obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o | 114 | obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o |
| 115 | obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o | 115 | obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o |
| 116 | obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o | ||
| 116 | obj-$(CONFIG_PPPOE) += pppox.o pppoe.o | 117 | obj-$(CONFIG_PPPOE) += pppox.o pppoe.o |
| 117 | 118 | ||
| 118 | obj-$(CONFIG_SLIP) += slip.o | 119 | obj-$(CONFIG_SLIP) += slip.o |