Moved conditional compilation to Makefile for SK98 Ethernet driver

Brute-force removal of #ifdefs.  Didn't touch the code.
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

diff --git a/drivers/net/sk98lin/Makefile b/drivers/net/sk98lin/Makefile
index 8b83fae..f1bc4a7 100644 (file)
--- a/drivers/net/sk98lin/Makefile
+++ b/drivers/net/sk98lin/Makefile
@@ -29,24 +29,12 @@ include $(TOPDIR)/config.mk
 
 LIB    := $(obj)libsk98lin.a
 
-COBJS-y += skge.o
-COBJS-y += skaddr.o
-COBJS-y += skgehwt.o
-COBJS-y += skgeinit.o
-COBJS-y += skgepnmi.o
-COBJS-y += skgesirq.o
-COBJS-y += ski2c.o
-COBJS-y += sklm80.o
-COBJS-y += skqueue.o
-COBJS-y += skrlmt.o
-COBJS-y += sktimer.o
-COBJS-y += skvpd.o
-COBJS-y += skxmac2.o
-COBJS-y += skcsum.o
+COBJS-$(CONFIG_SK98) += skge.o skaddr.o skgehwt.o skgeinit.o skgepnmi.o \
+       skgesirq.o ski2c.o sklm80.o skqueue.o skrlmt.o sktimer.o \
+       skvpd.o skxmac2.o skcsum.o
 #COBJS-y += skproc.o
 
-COBJS-y += uboot_skb.o
-COBJS-y += uboot_drv.o
+COBJS-$(CONFIG_SK98) += uboot_skb.o uboot_drv.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)

diff --git a/drivers/net/sk98lin/skaddr.c b/drivers/net/sk98lin/skaddr.c
index ed79c04..8d34f72 100644 (file)
--- a/drivers/net/sk98lin/skaddr.c
+++ b/drivers/net/sk98lin/skaddr.c
@@ -220,8 +220,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 #ifndef        lint
 static const char SysKonnectFileId[] =
        "@(#) $Id: skaddr.c,v 1.48 2003/02/12 17:09:37 tschilli Exp $ (C) SysKonnect.";
@@ -1875,5 +1873,3 @@ SK_U32    ToPortNumber)           /* Port2 Index */
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-
-#endif /* CONFIG_SK98 */

diff --git a/drivers/net/sk98lin/skcsum.c b/drivers/net/sk98lin/skcsum.c
index a5dc572..162b67d 100644 (file)
--- a/drivers/net/sk98lin/skcsum.c
+++ b/drivers/net/sk98lin/skcsum.c
@@ -72,8 +72,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 #ifdef SK_USE_CSUM     /* Check if CSUM is to be used. */
 
 #ifndef lint
@@ -925,5 +923,3 @@ SK_EVPARA   Param)  /* Event dependent parameter. */
 }      /* SkCsEvent */
 
 #endif /* SK_USE_CSUM */
-
-#endif /* CONFIG_SK98 */

diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index e1d7e87..c815480 100644 (file)
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -342,8 +342,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 #include       "h/skversion.h"
 #if 0
 #include       <linux/module.h>
@@ -4860,5 +4858,3 @@ int       l;
 } /* DumpLong */
 
 #endif
-
-#endif /* CONFIG_SK98 */

diff --git a/drivers/net/sk98lin/skgehwt.c b/drivers/net/sk98lin/skgehwt.c
index f8681a8..ca08eb1 100644 (file)
--- a/drivers/net/sk98lin/skgehwt.c
+++ b/drivers/net/sk98lin/skgehwt.c
@@ -75,8 +75,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 /*
        Event queue and dispatcher
 */
@@ -214,7 +212,4 @@ SK_IOC      Ioc)    /* IoContext */
        pAC->Hwt.TStop = pAC->Hwt.TStart;
        SkTimerDone(pAC,Ioc) ;
 }
-
-#endif /* CONFIG_SK98 */
-
 /* End of file */

diff --git a/drivers/net/sk98lin/skgeinit.c b/drivers/net/sk98lin/skgeinit.c
index e49685b..ab740c7 100644 (file)
--- a/drivers/net/sk98lin/skgeinit.c
+++ b/drivers/net/sk98lin/skgeinit.c
@@ -395,8 +395,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 #include "h/skdrv1st.h"
 #include "h/skdrv2nd.h"
 
@@ -2367,5 +2365,3 @@ int               Port)           /* Port to configure */
 
        return(0);
 }      /* SkGeInitPort */
-
-#endif /* CONFIG_SK98 */

diff --git a/drivers/net/sk98lin/skgemib.c b/drivers/net/sk98lin/skgemib.c
index 4a9e9e6..7f62e9c 100644 (file)
--- a/drivers/net/sk98lin/skgemib.c
+++ b/drivers/net/sk98lin/skgemib.c
@@ -52,8 +52,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 /*
  * PRIVATE OID handler function prototypes
  */
@@ -1056,5 +1054,3 @@ PNMI_STATIC const SK_PNMI_TAB_ENTRY IdTable[] = {
                0,
                SK_PNMI_RO, Vct, 0},
 };
-
-#endif /* CONFIG_SK98 */

diff --git a/drivers/net/sk98lin/skgepnmi.c b/drivers/net/sk98lin/skgepnmi.c
index 16fa352..d0e33cb 100644 (file)
--- a/drivers/net/sk98lin/skgepnmi.c
+++ b/drivers/net/sk98lin/skgepnmi.c
@@ -434,8 +434,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 static const char SysKonnectFileId[] =
        "@(#) $Id: skgepnmi.c,v 1.102 2002/12/16 14:03:24 tschilli Exp $"
        " (C) SysKonnect.";
@@ -8306,5 +8304,3 @@ SK_U32            PhysPortIndex)
        }
 
 } /* CheckVctStatus */
-
-#endif /* CONFIG_SK98 */

diff --git a/drivers/net/sk98lin/skgesirq.c b/drivers/net/sk98lin/skgesirq.c
index c9763e7..106fe48 100644 (file)
--- a/drivers/net/sk98lin/skgesirq.c
+++ b/drivers/net/sk98lin/skgesirq.c
@@ -339,8 +339,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 /*
  *     Special Interrupt handler
  *
@@ -2412,6 +2410,4 @@ SK_U16    IStatus)        /* Interrupt Status */
 }      /* SkPhyIsrLone */
 #endif /* OTHER_PHY */
 
-#endif /* CONFIG_SK98 */
-
 /* End of File */

diff --git a/drivers/net/sk98lin/ski2c.c b/drivers/net/sk98lin/ski2c.c
index 0c5d9b4..894cc67 100644 (file)
--- a/drivers/net/sk98lin/ski2c.c
+++ b/drivers/net/sk98lin/ski2c.c
@@ -230,8 +230,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 /*
  *     I2C Protocol
  */
@@ -1501,5 +1499,3 @@ SK_EVPARA Para)   /* Event specific Parameter */
 }      /* SkI2cEvent*/
 
 #endif /* !SK_DIAG */
-
-#endif /* CONFIG_SK98 */

diff --git a/drivers/net/sk98lin/sklm80.c b/drivers/net/sk98lin/sklm80.c
index 0229877..9f455f7 100644 (file)
--- a/drivers/net/sk98lin/sklm80.c
+++ b/drivers/net/sk98lin/sklm80.c
@@ -100,8 +100,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 /*
        LM80 functions
 */
@@ -288,5 +286,3 @@ SK_SENSOR   *pSen)  /* Sensor to be read */
        /* Not completed */
        return(0);
 }
-
-#endif /* CONFIG_SK98 */

diff --git a/drivers/net/sk98lin/skproc.c b/drivers/net/sk98lin/skproc.c
index 94a6a56..9325ee7 100644 (file)
--- a/drivers/net/sk98lin/skproc.c
+++ b/drivers/net/sk98lin/skproc.c
@@ -72,8 +72,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 #include <linux/proc_fs.h>
 
 #include "h/skdrv1st.h"
@@ -510,5 +508,3 @@ char * SkNumber(char * str, long long num, int base, int size, int precision
 
        return strorg;
 }
-
-#endif /* CONFIG_SK98 */

diff --git a/drivers/net/sk98lin/skqueue.c b/drivers/net/sk98lin/skqueue.c
index c49baed..de7441e 100644 (file)
--- a/drivers/net/sk98lin/skqueue.c
+++ b/drivers/net/sk98lin/skqueue.c
@@ -89,8 +89,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 /*
        Event queue and dispatcher
 */
@@ -237,6 +235,4 @@ SK_IOC      Ioc)    /* Io context */
        return(0) ;
 }
 
-#endif /* CONFIG_SK98 */
-
 /* End of file */

diff --git a/drivers/net/sk98lin/skrlmt.c b/drivers/net/sk98lin/skrlmt.c
index 14a6f40..2e7924d 100644 (file)
--- a/drivers/net/sk98lin/skrlmt.c
+++ b/drivers/net/sk98lin/skrlmt.c
@@ -282,8 +282,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 #ifndef        lint
 static const char SysKonnectFileId[] =
        "@(#) $Id: skrlmt.c,v 1.68 2003/01/31 15:26:56 rschmidt Exp $ (C) SysKonnect.";
@@ -3504,5 +3502,3 @@ SK_EVPARA Para)   /* Event-specific parameter */
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-
-#endif /* CONFIG_SK98 */

diff --git a/drivers/net/sk98lin/sktimer.c b/drivers/net/sk98lin/sktimer.c
index 37cd4c9..8363ce4 100644 (file)
--- a/drivers/net/sk98lin/sktimer.c
+++ b/drivers/net/sk98lin/sktimer.c
@@ -74,8 +74,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 /*
        Event queue and dispatcher
 */
@@ -292,6 +290,4 @@ int Restart)        /* Do we need to restart the Hardware timer ? */
        }
 }
 
-#endif /* CONFIG_SK98 */
-
 /* End of file */

diff --git a/drivers/net/sk98lin/skvpd.c b/drivers/net/sk98lin/skvpd.c
index 429da82..7935195 100644 (file)
--- a/drivers/net/sk98lin/skvpd.c
+++ b/drivers/net/sk98lin/skvpd.c
@@ -162,8 +162,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 /*
        Please refer skvpd.txt for infomation how to include this module
  */
@@ -1325,5 +1323,3 @@ char      *msg)   /* error log message */
 
        (void)VpdUpdate(pAC, IoC);
 }
-
-#endif /* CONFIG_SK98 */

diff --git a/drivers/net/sk98lin/skxmac2.c b/drivers/net/sk98lin/skxmac2.c
index 7946000..e0ded42 100644 (file)
--- a/drivers/net/sk98lin/skxmac2.c
+++ b/drivers/net/sk98lin/skxmac2.c
@@ -412,8 +412,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_SK98
-
 #include "h/skdrv1st.h"
 #include "h/skdrv2nd.h"
 
@@ -4391,6 +4389,4 @@ SK_BOOL   StartTest)      /* flag for start / get result */
        return(0);
 }      /* SkGmCableDiagStatus */
 
-#endif /* CONFIG_SK98 */
-
 /* End of file */

diff --git a/drivers/net/sk98lin/uboot_drv.c b/drivers/net/sk98lin/uboot_drv.c
index d02cd1b..8b04842 100644 (file)
--- a/drivers/net/sk98lin/uboot_drv.c
+++ b/drivers/net/sk98lin/uboot_drv.c
@@ -25,9 +25,6 @@
 
 #include <common.h>
 
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
-       defined(CONFIG_SK98)
-
 #include "h/skdrv1st.h"
 #include "h/skdrv2nd.h"
 #include "u-boot_compat.h"
@@ -138,6 +135,3 @@ static int skge_recv(struct eth_device *dev)
 
        return 0;
 }
-
-
-#endif /* CONFIG_SK98 */

diff --git a/drivers/net/sk98lin/uboot_skb.c b/drivers/net/sk98lin/uboot_skb.c
index 3a487a8..487f01e 100644 (file)
--- a/drivers/net/sk98lin/uboot_skb.c
+++ b/drivers/net/sk98lin/uboot_skb.c
@@ -24,9 +24,6 @@
  */
 
 #include <config.h>
-
-#ifdef CONFIG_SK98
-
 #include <common.h>
 #include "u-boot_compat.h"
 
@@ -118,5 +115,3 @@ void skb_put(struct sk_buff *skb, unsigned int len)
 {
        skb->len+=len;
 }
-
-#endif /* CONFIG_SK98 */