Merge git://git.denx.de/u-boot into x1

[u-boot] / drivers / net / sk98lin / skgeinit.c

diff --git a/drivers/net/sk98lin/skgeinit.c b/drivers/net/sk98lin/skgeinit.c
index e49685bb9c9d09305362b1801c9f172f18675608..df63f27e84d284aee80684ee1e32f176075f04e6 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"
 
@@ -1884,10 +1882,10 @@ SK_IOC  IoC)            /* IO context */
 
        /* read number of MACs */
        SK_IN8(IoC, B2_MAC_CFG, &Byte);
-       pAC->GIni.GIMacsFound = (Byte & CFG_SNG_MAC) ? 1 : 2;
+       pAC->GIni.GIMacsFound = (Byte & CONFIG_SYS_SNG_MAC) ? 1 : 2;
 
        /* get Chip Revision Number */
-       pAC->GIni.GIChipRev = (SK_U8)((Byte & CFG_CHIP_R_MSK) >> 4);
+       pAC->GIni.GIChipRev = (SK_U8)((Byte & CONFIG_SYS_CHIP_R_MSK) >> 4);
 
        /* get diff. PCI parameters */
        SK_IN16(IoC, B0_CTST, &CtrlStat);
@@ -2367,5 +2365,3 @@ int               Port)           /* Port to configure */
 
        return(0);
 }      /* SkGeInitPort */
-
-#endif /* CONFIG_SK98 */