diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 11:51:24 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 11:51:24 +0100 |
commit | 3b621ee5df437d3f332a635ab6421aaa61a7dc2b (patch) | |
tree | c4a5236cee8eb7418770802313d36a55f1cc0b1e /drivers/net/Makefile | |
parent | Merge branch 'master' (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
download | linux-3b621ee5df437d3f332a635ab6421aaa61a7dc2b.tar.xz linux-3b621ee5df437d3f332a635ab6421aaa61a7dc2b.zip |
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 obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o +obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o obj-$(CONFIG_PPPOE) += pppox.o pppoe.o obj-$(CONFIG_SLIP) += slip.o |