diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /drivers/net/Makefile | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index fc59bfb08..77a2c7298 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -27,7 +27,7 @@ MOD_LIST_NAME := NET_MODULES # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'. export-objs := 8390.o arlan.o aironet4500_core.o aironet4500_card.o ppp_async.o \ - ppp_generic.o slhc.o + ppp_generic.o slhc.o pppox.o ifeq ($(CONFIG_PCMCIA),y) SUB_DIRS += pcmcia @@ -214,12 +214,14 @@ ifeq ($(CONFIG_PPP),y) ifeq ($(CONFIG_PPP_BSDCOMP),m) obj-m += bsd_comp.o endif + obj-$(CONFIG_PPPOE) += pppox.o pppoe.o else ifeq ($(CONFIG_PPP),m) obj-m += ppp_generic.o slhc.o obj-$(CONFIG_PPP_ASYNC) += ppp_async.o obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o obj-$(CONFIG_PPP_DEFLATE) += ppp_deflate.o + obj-$(CONFIG_PPPOE) += pppox.o pppoe.o ifeq ($(CONFIG_PPP_BSDCOMP),m) obj-m += bsd_comp.o endif |