X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsk98lin%2Fskgeinit.c;h=df63f27e84d284aee80684ee1e32f176075f04e6;hb=ca02f6f8dc4966b2a019b15e01b5070189327df2;hp=a18dc0a48862a370cfbf5894227e64bf81940956;hpb=521dcd30b9cc5b72cd27ae04104f19369251aa20;p=people%2Fms%2Fu-boot.git

diff --git a/drivers/net/sk98lin/skgeinit.c b/drivers/net/sk98lin/skgeinit.c
index a18dc0a488..df63f27e84 100644
--- 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"
 
@@ -585,7 +583,7 @@ int		Mode)		/* Mode may be SK_LED_DIS, SK_LED_ENA, SK_LED_TST */
  *	1:	configuration error
  */
 static int DoCalcAddr(
-SK_AC		*pAC, 			/* adapter context */
+SK_AC		*pAC,			/* adapter context */
 SK_GEPORT	*pPrt,			/* port index */
 int			QuSize,			/* size of the queue to configure in kB */
 SK_U32		*StartVal,		/* start value for address calculation */
@@ -1263,9 +1261,8 @@ int		Port)		/* Port Index (MAC_1 + n) */
 	pPrt = &pAC->GIni.GP[Port];
 
 	if (pPrt->PRxQSize == SK_MIN_RXQ_SIZE) {
-		RxQType = SK_RX_SRAM_Q; 	/* small Rx Queue */
-	}
-	else {
+		RxQType = SK_RX_SRAM_Q;		/* small Rx Queue */
+	} else {
 		RxQType = SK_RX_BRAM_Q;		/* big Rx Queue */
 	}
 
@@ -1354,7 +1351,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
 
 	/*
 	 * Tx Queue: Release all local resets if the queue is used !
-	 * 		set watermark
+	 *		set watermark
 	 */
 	if (pPrt->PXSQSize != 0) {
 		SK_OUT32(IoC, Q_ADDR(pPrt->PXsQOff, Q_CSR), CSR_CLR_RESET);
@@ -1416,7 +1413,7 @@ int		QuIoOffs)	/* Queue IO Address Offset */
  *	It is possible to stop the receive and transmit path separate or
  *	both together.
  *
- *	Dir =	SK_STOP_TX 	Stops the transmit path only and resets the MAC.
+ *	Dir =	SK_STOP_TX	Stops the transmit path only and resets the MAC.
  *				The receive queue is still active and
  *				the pending Rx frames may be still transferred
  *				into the RxD.
@@ -1885,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);
@@ -2368,5 +2365,3 @@ int		Port)		/* Port to configure */
 
 	return(0);
 }	/* SkGeInitPort */
-
-#endif /* CONFIG_SK98 */