Incorrect drivers/net/Makefile for compressed slip

[Keith Owens <kaos@xxxxxxxxxx>]

drivers/net/Makefile 2.4.7 contains this.

obj-$(CONFIG_SLIP) += slip.o
ifeq ($(CONFIG_SLIP),y) 
  obj-$(CONFIG_SLIP_COMPRESSED) += slhc.o
else 
  ifeq ($(CONFIG_SLIP),m)
    obj-$(CONFIG_SLIP_COMPRESSED) += slhc.o
  endif
endif

CONFIG_SLIP is tristate, CONFIG_SLIP_COMPRESSED is bool.  The effect of
CONFIG_SLIP=m, CONFIG_SLIP_COMPRESSED=y is to make slip.o a module but
slhc.o is linked into vmlinux.o.  Since slhc.c has init_module
routines, it was obviously intended to be a module.  IMHO the Makefile
should be

Index: 7.1/drivers/net/Makefile
--- 7.1/drivers/net/Makefile Tue, 10 Jul 2001 10:31:22 +1000 kaos 
(linux-2.4/l/c/26_Makefile 1.1.1.1.3.3.1.1.1.2.1.2 644)
+++ 7.1(w)/drivers/net/Makefile Sat, 28 Jul 2001 11:37:22 +1000 kaos 
(linux-2.4/l/c/26_Makefile 1.1.1.1.3.3.1.1.1.2.1.2 644)
@@ -137,12 +137,8 @@ obj-$(CONFIG_PPP_BSDCOMP) += bsd_comp.o
 obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
 
 obj-$(CONFIG_SLIP) += slip.o
-ifeq ($(CONFIG_SLIP),y)
-  obj-$(CONFIG_SLIP_COMPRESSED) += slhc.o
-else
-  ifeq ($(CONFIG_SLIP),m)
-    obj-$(CONFIG_SLIP_COMPRESSED) += slhc.o
-  endif
+ifeq ($(CONFIG_SLIP_COMPRESSED),y)
+  obj-$(CONFIG_SLIP) += slhc.o
 endif
 
 obj-$(CONFIG_STRIP) += strip.o