Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your

Makefiles.

1 files changed, 3 insertions, 13 deletions

diff --git a/drivers/net/skfp/Makefile b/drivers/net/skfp/Makefile
index 5f681ca17..f8cc4b23a 100644
--- a/drivers/net/skfp/Makefile
+++ b/drivers/net/skfp/Makefile
@@ -2,22 +2,12 @@
 # Makefile for the SysKonnect FDDI PCI adapter driver
 #
 
-ifeq ($(CONFIG_SKFP),y)
-    O_TARGET := skfp.o
-    O_OBJS =  skfddi.o    hwmtm.o    fplustm.o  smt.o      cfm.o     \
+O_TARGET := skfp.o
+obj-y :=      skfddi.o    hwmtm.o    fplustm.o  smt.o      cfm.o     \
               ecm.o       pcmplc.o   pmf.o      queue.o    rmt.o     \
 	      smtdef.o    smtinit.o  smttimer.o srf.o      lnkstat.o \
               smtparse.o  hwt.o      drvfbi.o   ess.o
-else
-  ifeq ($(CONFIG_SKFP),m)
-    M_OBJS := skfp.o
-    O_TARGET := skfp.o
-    O_OBJS =  skfddi.o    hwmtm.o    fplustm.o  smt.o      cfm.o     \
-              ecm.o       pcmplc.o   pmf.o      queue.o    rmt.o     \
-	      smtdef.o    smtinit.o  smttimer.o srf.o      lnkstat.o \
-              smtparse.o  hwt.o      drvfbi.o   ess.o
-  endif
-endif
+obj-m := skfp.o
 
 # NOTE:
 #   Compiling this driver produces some warnings (and some more are