diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 23:45:22 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 23:45:22 +0000 |
| commit | 5b35aa5cd29bb111d847b2a2ed18110acbfb1f44 (patch) | |
| tree | c7bbaa1137528330d3c74d14056ef7016a52be72 /drivers/net/Makefile | |
| parent | 511bcd7c5924ce9e98ad1cb851988f7448dfef0f (diff) | |
Merge with Linux 2.3.24.
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index fe9208d4d..12fbc99f3 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -299,6 +299,13 @@ CONFIG_SLHC_BUILTIN = y MX_OBJS += ppp_async.o endif endif + ifeq ($(CONFIG_PPP_SYNC_TTY),y) + LX_OBJS += ppp_synctty.o + else + ifeq ($(CONFIG_PPP_SYNC_TTY),m) + MX_OBJS += ppp_synctty.o + endif + endif ifeq ($(CONFIG_PPP_DEFLATE),y) CONFIG_PPPDEF_BUILTIN = y else @@ -316,6 +323,9 @@ else ifeq ($(CONFIG_PPP_ASYNC),m) MX_OBJS += ppp_async.o endif + ifeq ($(CONFIG_PPP_SYNC_TTY),m) + MX_OBJS += ppp_synctty.o + endif ifeq ($(CONFIG_PPP_DEFLATE),m) CONFIG_PPPDEF_MODULE = y endif @@ -1031,6 +1041,14 @@ else endif endif +ifeq ($(CONFIG_NCR885E),y) +L_OBJS += ncr885e.o +else + ifeq ($(CONFIG_NCR885E),m) + M_OBJS += ncr885e.o + endif +endif + ifeq ($(CONFIG_ADAPTEC_STARFIRE),y) L_OBJS += starfire.o else |