diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /drivers/net/Makefile | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 47738877f..3bd7f7280 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -581,6 +581,14 @@ else endif endif +ifeq ($(CONFIG_EPIC100),y) +L_OBJS += epic100.o +else + ifeq ($(CONFIG_EPIC100),m) + M_OBJS += epic100.o + endif +endif + # If anything built-in uses slhc, then build it into the kernel also. # If not, but a module uses it, build as a module. ifdef CONFIG_SLHC_BUILTIN |