SOURCES: sk98lin_v8.40.2.3_2.4.33_patch - fixed version

marcus marcus at pld-linux.org
Thu Aug 17 10:06:29 CEST 2006


Author: marcus                       Date: Thu Aug 17 08:06:29 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed version

---- Files affected:
SOURCES:
   sk98lin_v8.40.2.3_2.4.33_patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/sk98lin_v8.40.2.3_2.4.33_patch
diff -u SOURCES/sk98lin_v8.40.2.3_2.4.33_patch:1.1 SOURCES/sk98lin_v8.40.2.3_2.4.33_patch:1.2
--- SOURCES/sk98lin_v8.40.2.3_2.4.33_patch:1.1	Thu Aug 17 09:34:45 2006
+++ SOURCES/sk98lin_v8.40.2.3_2.4.33_patch	Thu Aug 17 10:06:24 2006
@@ -1,6 +1,6 @@
-diff -ruN linux/drivers/net/sk98lin/build_no.c linux-new/drivers/net/sk98lin/build_no.c
---- linux/drivers/net/sk98lin/build_no.c	2003-06-13 14:51:35.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/build_no.c	1970-01-01 00:00:00.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/build_no.c linux-2.4.33/drivers/net/sk98lin/build_no.c
+--- linux-2.4.33.old/drivers/net/sk98lin/build_no.c	2003-06-13 14:51:35.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/build_no.c	1970-01-01 00:00:00.000000000 +0000
 @@ -1,10 +0,0 @@
 -/******************************************************************************
 - *
@@ -13,9 +13,9 @@
 -	"@(#)SK-BUILD: 6.02 (20021219) PL: ALL.01";
 -^Z
 \ Brak znaku nowej linii na końcu pliku
-diff -ruN linux/drivers/net/sk98lin/h/lm80.h linux-new/drivers/net/sk98lin/h/lm80.h
---- linux/drivers/net/sk98lin/h/lm80.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/lm80.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/lm80.h linux-2.4.33/drivers/net/sk98lin/h/lm80.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/lm80.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/lm80.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,6 +2,8 @@
   *
   * Name:	lm80.h	
@@ -41,9 +41,9 @@
   *
   ******************************************************************************/
  
-diff -ruN linux/drivers/net/sk98lin/h/skaddr.h linux-new/drivers/net/sk98lin/h/skaddr.h
---- linux/drivers/net/sk98lin/h/skaddr.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skaddr.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skaddr.h linux-2.4.33/drivers/net/sk98lin/h/skaddr.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skaddr.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skaddr.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,12 +2,15 @@
   *
   * Name:	skaddr.h
@@ -88,9 +88,9 @@
  extern	int	SkAddrMcUpdate(
  	SK_AC	*pAC,
  	SK_IOC	IoC,
-diff -ruN linux/drivers/net/sk98lin/h/skcsum.h linux-new/drivers/net/sk98lin/h/skcsum.h
---- linux/drivers/net/sk98lin/h/skcsum.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skcsum.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skcsum.h linux-2.4.33/drivers/net/sk98lin/h/skcsum.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skcsum.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skcsum.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,12 +2,15 @@
   *
   * Name:	skcsum.h
@@ -125,9 +125,9 @@
  
  	/* The protocol statistics structure; one per supported protocol. */
  	SKCS_PROTO_STATS ProtoStats[SK_MAX_NETS][SKCS_NUM_PROTOCOLS];
-diff -ruN linux/drivers/net/sk98lin/h/skdebug.h linux-new/drivers/net/sk98lin/h/skdebug.h
---- linux/drivers/net/sk98lin/h/skdebug.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skdebug.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skdebug.h linux-2.4.33/drivers/net/sk98lin/h/skdebug.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skdebug.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skdebug.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,21 +2,24 @@
   *
   * Name:	skdebug.h
@@ -182,9 +182,9 @@
  
  /* Debug events */
  
-diff -ruN linux/drivers/net/sk98lin/h/skdrv1st.h linux-new/drivers/net/sk98lin/h/skdrv1st.h
---- linux/drivers/net/sk98lin/h/skdrv1st.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skdrv1st.h	2006-03-22 09:09:56.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skdrv1st.h linux-2.4.33/drivers/net/sk98lin/h/skdrv1st.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skdrv1st.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skdrv1st.h	2006-03-22 09:09:56.000000000 +0000
 @@ -2,6 +2,8 @@
   *
   * Name:	skdrv1st.h
@@ -278,9 +278,9 @@
 + * End of file
 + *
 + ******************************************************************************/
-diff -ruN linux/drivers/net/sk98lin/h/skdrv2nd.h linux-new/drivers/net/sk98lin/h/skdrv2nd.h
---- linux/drivers/net/sk98lin/h/skdrv2nd.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skdrv2nd.h	2006-08-17 09:27:51.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skdrv2nd.h linux-2.4.33/drivers/net/sk98lin/h/skdrv2nd.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skdrv2nd.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skdrv2nd.h	2006-03-22 09:09:56.000000000 +0000
 @@ -1,15 +1,17 @@
  /******************************************************************************
   *
@@ -367,7 +367,7 @@
 -    }     \
 -}
 +/* Defines for the poll cotroller */
-+#undef SK_NETDUMP_POLL
++#define SK_NETDUMP_POLL
 +
 +#ifdef SK_NETDUMP_POLL
 +#ifdef HAVE_POLL_CONTROLLER
@@ -1459,9 +1459,9 @@
 + * End of file
 + *
 + ******************************************************************************/
-diff -ruN linux/drivers/net/sk98lin/h/skerror.h linux-new/drivers/net/sk98lin/h/skerror.h
---- linux/drivers/net/sk98lin/h/skerror.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skerror.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skerror.h linux-2.4.33/drivers/net/sk98lin/h/skerror.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skerror.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skerror.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,21 +2,24 @@
   *
   * Name:	skerror.h
@@ -1508,9 +1508,9 @@
  
  #endif	/* _INC_SKERROR_H_ */
 +
-diff -ruN linux/drivers/net/sk98lin/h/skgedrv.h linux-new/drivers/net/sk98lin/h/skgedrv.h
---- linux/drivers/net/sk98lin/h/skgedrv.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skgedrv.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skgedrv.h linux-2.4.33/drivers/net/sk98lin/h/skgedrv.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skgedrv.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skgedrv.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,21 +2,24 @@
   *
   * Name:	skgedrv.h
@@ -1560,9 +1560,9 @@
 +#define SK_DRV_LIPA_NOT_AN_ABLE	16	/* Link Partner not Auto-Negotiation able */
 +#define SK_DRV_PEX_LINK_WIDTH	17	/* PEX negotiated Link width not maximum */
  #endif /* __INC_SKGEDRV_H_ */
-diff -ruN linux/drivers/net/sk98lin/h/skgehw.h linux-new/drivers/net/sk98lin/h/skgehw.h
---- linux/drivers/net/sk98lin/h/skgehw.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skgehw.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skgehw.h linux-2.4.33/drivers/net/sk98lin/h/skgehw.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skgehw.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skgehw.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,21 +2,24 @@
   *
   * Name:	skgehw.h
@@ -4016,9 +4016,9 @@
  
  #endif	/* __INC_SKGEHW_H */
 +
-diff -ruN linux/drivers/net/sk98lin/h/skgehwt.h linux-new/drivers/net/sk98lin/h/skgehwt.h
---- linux/drivers/net/sk98lin/h/skgehwt.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skgehwt.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skgehwt.h linux-2.4.33/drivers/net/sk98lin/h/skgehwt.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skgehwt.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skgehwt.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,6 +2,8 @@
   *
   * Name:	skhwt.h
@@ -4028,9 +4028,9 @@
   * Purpose:	Defines for the hardware timer functions
   *
   ******************************************************************************/
-diff -ruN linux/drivers/net/sk98lin/h/skgei2c.h linux-new/drivers/net/sk98lin/h/skgei2c.h
---- linux/drivers/net/sk98lin/h/skgei2c.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skgei2c.h	1970-01-01 00:00:00.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skgei2c.h linux-2.4.33/drivers/net/sk98lin/h/skgei2c.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skgei2c.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skgei2c.h	1970-01-01 00:00:00.000000000 +0000
 @@ -1,208 +0,0 @@
 -/******************************************************************************
 - *
@@ -4240,9 +4240,9 @@
 -
 -extern	int SkLm80ReadSensor(SK_AC *pAC, SK_IOC IoC, SK_SENSOR *pSen);
 -#endif	/* n_INC_SKGEI2C_H */
-diff -ruN linux/drivers/net/sk98lin/h/skgeinit.h linux-new/drivers/net/sk98lin/h/skgeinit.h
---- linux/drivers/net/sk98lin/h/skgeinit.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skgeinit.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skgeinit.h linux-2.4.33/drivers/net/sk98lin/h/skgeinit.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skgeinit.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skgeinit.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,21 +2,24 @@
   *
   * Name:	skgeinit.h
@@ -5002,9 +5002,9 @@
 +#endif /* __INC_SKGEINIT_H_ */
  
 -#endif	/* __INC_SKGEINIT_H_ */
-diff -ruN linux/drivers/net/sk98lin/h/skgepnm2.h linux-new/drivers/net/sk98lin/h/skgepnm2.h
---- linux/drivers/net/sk98lin/h/skgepnm2.h	2006-08-17 09:26:19.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skgepnm2.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skgepnm2.h linux-2.4.33/drivers/net/sk98lin/h/skgepnm2.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skgepnm2.h	2006-08-17 09:53:04.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skgepnm2.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,12 +2,15 @@
   *
   * Name:	skgepnm2.h
@@ -5079,9 +5079,9 @@
  
  #else	/* !DEBUG */
  
-diff -ruN linux/drivers/net/sk98lin/h/skgepnm2.h.orig linux-new/drivers/net/sk98lin/h/skgepnm2.h.orig
---- linux/drivers/net/sk98lin/h/skgepnm2.h.orig	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skgepnm2.h.orig	1970-01-01 00:00:00.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skgepnm2.h.orig linux-2.4.33/drivers/net/sk98lin/h/skgepnm2.h.orig
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skgepnm2.h.orig	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skgepnm2.h.orig	1970-01-01 00:00:00.000000000 +0000
 @@ -1,332 +0,0 @@
 -/*****************************************************************************
 - *
@@ -5415,9 +5415,9 @@
 -#endif	/* !DEBUG */
 -
 -#endif	/* _SKGEPNM2_H_ */
-diff -ruN linux/drivers/net/sk98lin/h/skgepnmi.h linux-new/drivers/net/sk98lin/h/skgepnmi.h
---- linux/drivers/net/sk98lin/h/skgepnmi.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skgepnmi.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skgepnmi.h linux-2.4.33/drivers/net/sk98lin/h/skgepnmi.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skgepnmi.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skgepnmi.h	2006-03-22 09:09:55.000000000 +0000
 @@ -1,13 +1,16 @@
  /*****************************************************************************
   *
@@ -5762,9 +5762,9 @@
  } SK_PNMI;
  
  
-diff -ruN linux/drivers/net/sk98lin/h/skgesirq.h linux-new/drivers/net/sk98lin/h/skgesirq.h
---- linux/drivers/net/sk98lin/h/skgesirq.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skgesirq.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skgesirq.h linux-2.4.33/drivers/net/sk98lin/h/skgesirq.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skgesirq.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skgesirq.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,21 +2,24 @@
   *
   * Name:	skgesirq.h
@@ -5868,9 +5868,9 @@
  
  #endif	/* _INC_SKGESIRQ_H_ */
 +
-diff -ruN linux/drivers/net/sk98lin/h/skgetwsi.h linux-new/drivers/net/sk98lin/h/skgetwsi.h
---- linux/drivers/net/sk98lin/h/skgetwsi.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skgetwsi.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skgetwsi.h linux-2.4.33/drivers/net/sk98lin/h/skgetwsi.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skgetwsi.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skgetwsi.h	2006-03-22 09:09:55.000000000 +0000
 @@ -0,0 +1,243 @@
 +/******************************************************************************
 + *
@@ -6115,9 +6115,9 @@
 +extern	int SkLm80ReadSensor(SK_AC *pAC, SK_IOC IoC, SK_SENSOR *pSen);
 +#endif	/* n_INC_SKGETWSI_H */
 +
-diff -ruN linux/drivers/net/sk98lin/h/ski2c.h linux-new/drivers/net/sk98lin/h/ski2c.h
---- linux/drivers/net/sk98lin/h/ski2c.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/ski2c.h	1970-01-01 00:00:00.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/ski2c.h linux-2.4.33/drivers/net/sk98lin/h/ski2c.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/ski2c.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/ski2c.h	1970-01-01 00:00:00.000000000 +0000
 @@ -1,175 +0,0 @@
 -/******************************************************************************
 - *
@@ -6294,9 +6294,9 @@
 -#endif /* !SK_DIAG */
 -#endif /* n_SKI2C_H */
 -
-diff -ruN linux/drivers/net/sk98lin/h/skqueue.h linux-new/drivers/net/sk98lin/h/skqueue.h
---- linux/drivers/net/sk98lin/h/skqueue.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skqueue.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skqueue.h linux-2.4.33/drivers/net/sk98lin/h/skqueue.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skqueue.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skqueue.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,6 +2,8 @@
   *
   * Name:	skqueue.h
@@ -6339,9 +6339,9 @@
 +#define	SKERR_Q_E005MSG	"Event scheduler called in Init Level 0 or 1"
  #endif	/* _SKQUEUE_H_ */
  
-diff -ruN linux/drivers/net/sk98lin/h/skrlmt.h linux-new/drivers/net/sk98lin/h/skrlmt.h
---- linux/drivers/net/sk98lin/h/skrlmt.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skrlmt.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skrlmt.h linux-2.4.33/drivers/net/sk98lin/h/skrlmt.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skrlmt.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skrlmt.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,12 +2,15 @@
   *
   * Name:	skrlmt.h
@@ -6366,9 +6366,9 @@
   *
   ******************************************************************************/
  
-diff -ruN linux/drivers/net/sk98lin/h/sktimer.h linux-new/drivers/net/sk98lin/h/sktimer.h
---- linux/drivers/net/sk98lin/h/sktimer.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/sktimer.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/sktimer.h linux-2.4.33/drivers/net/sk98lin/h/sktimer.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/sktimer.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/sktimer.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,6 +2,8 @@
   *
   * Name:	sktimer.h
@@ -6378,9 +6378,9 @@
   * Purpose:	Defines for the timer functions
   *
   ******************************************************************************/
-diff -ruN linux/drivers/net/sk98lin/h/sktwsi.h linux-new/drivers/net/sk98lin/h/sktwsi.h
---- linux/drivers/net/sk98lin/h/sktwsi.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/sktwsi.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/sktwsi.h linux-2.4.33/drivers/net/sk98lin/h/sktwsi.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/sktwsi.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/sktwsi.h	2006-03-22 09:09:55.000000000 +0000
 @@ -0,0 +1,179 @@
 +/******************************************************************************
 + *
@@ -6561,9 +6561,9 @@
 +#endif /* !SK_DIAG */
 +#endif /* n_SKTWSI_H */
 +
-diff -ruN linux/drivers/net/sk98lin/h/sktypes.h linux-new/drivers/net/sk98lin/h/sktypes.h
---- linux/drivers/net/sk98lin/h/sktypes.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/sktypes.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/sktypes.h linux-2.4.33/drivers/net/sk98lin/h/sktypes.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/sktypes.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/sktypes.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,6 +2,8 @@
   *
   * Name:	sktypes.h
@@ -6651,9 +6651,9 @@
 + * End of file
 + *
 + ******************************************************************************/
-diff -ruN linux/drivers/net/sk98lin/h/skversion.h linux-new/drivers/net/sk98lin/h/skversion.h
---- linux/drivers/net/sk98lin/h/skversion.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skversion.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skversion.h linux-2.4.33/drivers/net/sk98lin/h/skversion.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skversion.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skversion.h	2006-03-22 09:09:55.000000000 +0000
 @@ -1,15 +1,17 @@
  /******************************************************************************
   *
@@ -6704,9 +6704,9 @@
 + * End of file
 + *
 + ******************************************************************************/
-diff -ruN linux/drivers/net/sk98lin/h/skvpd.h linux-new/drivers/net/sk98lin/h/skvpd.h
---- linux/drivers/net/sk98lin/h/skvpd.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/skvpd.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/skvpd.h linux-2.4.33/drivers/net/sk98lin/h/skvpd.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/skvpd.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/skvpd.h	2006-03-22 09:09:55.000000000 +0000
 @@ -1,20 +1,22 @@
  /******************************************************************************
   *
@@ -6915,9 +6915,9 @@
  
  #endif	/* __INC_SKVPD_H_ */
 +
-diff -ruN linux/drivers/net/sk98lin/h/sky2le.h linux-new/drivers/net/sk98lin/h/sky2le.h
---- linux/drivers/net/sk98lin/h/sky2le.h	1970-01-01 00:00:00.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/sky2le.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/sky2le.h linux-2.4.33/drivers/net/sk98lin/h/sky2le.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/sky2le.h	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/sky2le.h	2006-03-22 09:09:55.000000000 +0000
 @@ -0,0 +1,893 @@
 +/******************************************************************************
 + *
@@ -7812,9 +7812,9 @@
 +
 +#endif	/* __INC_SKY2LE_H */
 +
-diff -ruN linux/drivers/net/sk98lin/h/xmac_ii.h linux-new/drivers/net/sk98lin/h/xmac_ii.h
---- linux/drivers/net/sk98lin/h/xmac_ii.h	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/h/xmac_ii.h	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/h/xmac_ii.h linux-2.4.33/drivers/net/sk98lin/h/xmac_ii.h
+--- linux-2.4.33.old/drivers/net/sk98lin/h/xmac_ii.h	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/h/xmac_ii.h	2006-03-22 09:09:55.000000000 +0000
 @@ -2,21 +2,24 @@
   *
   * Name:	xmac_ii.h
@@ -8900,9 +8900,9 @@
  
  #endif	/* __INC_XMAC_H */
 +
-diff -ruN linux/drivers/net/sk98lin/Makefile linux-new/drivers/net/sk98lin/Makefile
---- linux/drivers/net/sk98lin/Makefile	2004-02-18 13:36:31.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/Makefile	2006-08-17 09:27:51.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/Makefile linux-2.4.33/drivers/net/sk98lin/Makefile
+--- linux-2.4.33.old/drivers/net/sk98lin/Makefile	2004-02-18 13:36:31.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/Makefile	2006-03-22 09:09:56.000000000 +0000
 @@ -1,7 +1,60 @@
 -# File: drivers/sk98lin/Makefile
 +#******************************************************************************
@@ -8943,8 +8943,8 @@
 +# History:
 +#
 +#	$Log$
-+#	Revision 1.1  2006/08/17 07:34:45  marcus
-+#	- from http://www.marvell.com/drivers/upload/install-8_40.tar.bz2
++#	Revision 1.2  2006/08/17 08:06:24  marcus
++#	- fixed version
 +#	
 +#	Revision 1.9.2.1  2005/04/11 09:01:18  mlindner
 +#	Fix: Copyright year changed
@@ -9006,9 +9006,9 @@
 -
 -
 -
-diff -ruN linux/drivers/net/sk98lin/skaddr.c linux-new/drivers/net/sk98lin/skaddr.c
---- linux/drivers/net/sk98lin/skaddr.c	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/skaddr.c	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/skaddr.c linux-2.4.33/drivers/net/sk98lin/skaddr.c
+--- linux-2.4.33.old/drivers/net/sk98lin/skaddr.c	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/skaddr.c	2006-03-22 09:09:55.000000000 +0000
 @@ -2,14 +2,17 @@
   *
   * Name:	skaddr.c
@@ -10003,9 +10003,9 @@
  }	/* SkAddrSwap */
  
  #endif /* !SK_SLIM */
-diff -ruN linux/drivers/net/sk98lin/skcsum.c linux-new/drivers/net/sk98lin/skcsum.c
---- linux/drivers/net/sk98lin/skcsum.c	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/skcsum.c	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/skcsum.c linux-2.4.33/drivers/net/sk98lin/skcsum.c
+--- linux-2.4.33.old/drivers/net/sk98lin/skcsum.c	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/skcsum.c	2006-03-22 09:09:55.000000000 +0000
 @@ -2,12 +2,15 @@
   *
   * Name:	skcsum.c
@@ -10039,9 +10039,9 @@
  #endif	/* !lint */
  
  /******************************************************************************
-diff -ruN linux/drivers/net/sk98lin/skdim.c linux-new/drivers/net/sk98lin/skdim.c
---- linux/drivers/net/sk98lin/skdim.c	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/skdim.c	2006-03-22 09:09:56.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/skdim.c linux-2.4.33/drivers/net/sk98lin/skdim.c
+--- linux-2.4.33.old/drivers/net/sk98lin/skdim.c	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/skdim.c	2006-03-22 09:09:56.000000000 +0000
 @@ -1,15 +1,25 @@
  /******************************************************************************
   *
@@ -11107,9 +11107,9 @@
 + * End of file
 + *
 + ******************************************************************************/
-diff -ruN linux/drivers/net/sk98lin/skethtool.c linux-new/drivers/net/sk98lin/skethtool.c
---- linux/drivers/net/sk98lin/skethtool.c	1970-01-01 00:00:00.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/skethtool.c	2006-03-22 09:09:56.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/skethtool.c linux-2.4.33/drivers/net/sk98lin/skethtool.c
+--- linux-2.4.33.old/drivers/net/sk98lin/skethtool.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/skethtool.c	2006-03-22 09:09:56.000000000 +0000
 @@ -0,0 +1,1184 @@
 +/******************************************************************************
 + *
@@ -12295,9 +12295,9 @@
 + * End of file
 + *
 + ******************************************************************************/
-diff -ruN linux/drivers/net/sk98lin/skge.c linux-new/drivers/net/sk98lin/skge.c
---- linux/drivers/net/sk98lin/skge.c	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/skge.c	2006-03-22 09:09:56.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/skge.c linux-2.4.33/drivers/net/sk98lin/skge.c
+--- linux-2.4.33.old/drivers/net/sk98lin/skge.c	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/skge.c	2006-03-22 09:09:56.000000000 +0000
 @@ -1,32 +1,26 @@
  /******************************************************************************
   *
@@ -17676,9 +17676,9 @@
   *
   ******************************************************************************/
 +
-diff -ruN linux/drivers/net/sk98lin/skgehwt.c linux-new/drivers/net/sk98lin/skgehwt.c
---- linux/drivers/net/sk98lin/skgehwt.c	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/skgehwt.c	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/skgehwt.c linux-2.4.33/drivers/net/sk98lin/skgehwt.c
+--- linux-2.4.33.old/drivers/net/sk98lin/skgehwt.c	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/skgehwt.c	2006-03-22 09:09:55.000000000 +0000
 @@ -2,6 +2,8 @@
   *
   * Name:	skgehwt.c
@@ -17813,9 +17813,9 @@
  	SkTimerDone(pAC, Ioc);
  }
  
-diff -ruN linux/drivers/net/sk98lin/skgeinit.c linux-new/drivers/net/sk98lin/skgeinit.c
---- linux/drivers/net/sk98lin/skgeinit.c	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/skgeinit.c	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/skgeinit.c linux-2.4.33/drivers/net/sk98lin/skgeinit.c
+--- linux-2.4.33.old/drivers/net/sk98lin/skgeinit.c	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/skgeinit.c	2006-03-22 09:09:55.000000000 +0000
 @@ -2,25 +2,27 @@
   *
   * Name:	skgeinit.c
@@ -20955,9 +20955,9 @@
 +}	/* SkYuk2RestartRxBmu */
 +#endif /* YUK2 && !SK_SLIM */
 +
-diff -ruN linux/drivers/net/sk98lin/skgemib.c linux-new/drivers/net/sk98lin/skgemib.c
---- linux/drivers/net/sk98lin/skgemib.c	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/skgemib.c	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/skgemib.c linux-2.4.33/drivers/net/sk98lin/skgemib.c
+--- linux-2.4.33.old/drivers/net/sk98lin/skgemib.c	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/skgemib.c	2006-03-22 09:09:55.000000000 +0000
 @@ -2,12 +2,15 @@
   *
   * Name:	skgemib.c
@@ -21191,9 +21191,9 @@
  	{OID_SKGE_BOARDLEVEL,
  		0,
  		0,
-diff -ruN linux/drivers/net/sk98lin/skgepnmi.c linux-new/drivers/net/sk98lin/skgepnmi.c
---- linux/drivers/net/sk98lin/skgepnmi.c	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/skgepnmi.c	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/skgepnmi.c linux-2.4.33/drivers/net/sk98lin/skgepnmi.c
+--- linux-2.4.33.old/drivers/net/sk98lin/skgepnmi.c	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/skgepnmi.c	2006-03-22 09:09:55.000000000 +0000
 @@ -1,13 +1,16 @@
  /*****************************************************************************
   *
@@ -26828,9 +26828,9 @@
 +    return (RetCode);
 +}
 +#endif /* SK_ASF */
-diff -ruN linux/drivers/net/sk98lin/skgesirq.c linux-new/drivers/net/sk98lin/skgesirq.c
---- linux/drivers/net/sk98lin/skgesirq.c	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/skgesirq.c	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/skgesirq.c linux-2.4.33/drivers/net/sk98lin/skgesirq.c
+--- linux-2.4.33.old/drivers/net/sk98lin/skgesirq.c	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/skgesirq.c	2006-03-22 09:09:55.000000000 +0000
 @@ -2,21 +2,24 @@
   *
   * Name:	skgesirq.c
@@ -29274,9 +29274,9 @@
  
  /* End of File */
 +
-diff -ruN linux/drivers/net/sk98lin/ski2c.c linux-new/drivers/net/sk98lin/ski2c.c
---- linux/drivers/net/sk98lin/ski2c.c	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/ski2c.c	1970-01-01 00:00:00.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/ski2c.c linux-2.4.33/drivers/net/sk98lin/ski2c.c
+--- linux-2.4.33.old/drivers/net/sk98lin/ski2c.c	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/ski2c.c	1970-01-01 00:00:00.000000000 +0000
 @@ -1,1294 +0,0 @@
 -/******************************************************************************
 - *
@@ -30572,9 +30572,9 @@
 -}	/* SkI2cEvent*/
 -
 -#endif /* !SK_DIAG */
-diff -ruN linux/drivers/net/sk98lin/sklm80.c linux-new/drivers/net/sk98lin/sklm80.c
---- linux/drivers/net/sk98lin/sklm80.c	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/sklm80.c	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/sklm80.c linux-2.4.33/drivers/net/sk98lin/sklm80.c
+--- linux-2.4.33.old/drivers/net/sk98lin/sklm80.c	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/sklm80.c	2006-03-22 09:09:55.000000000 +0000
 @@ -2,12 +2,15 @@
   *
   * Name:	sklm80.c
@@ -30623,9 +30623,9 @@
   */
  int SkLm80ReadSensor(
  SK_AC		*pAC,	/* Adapter Context */
-diff -ruN linux/drivers/net/sk98lin/skproc.c linux-new/drivers/net/sk98lin/skproc.c
---- linux/drivers/net/sk98lin/skproc.c	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/skproc.c	2006-03-22 09:09:56.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/skproc.c linux-2.4.33/drivers/net/sk98lin/skproc.c
+--- linux-2.4.33.old/drivers/net/sk98lin/skproc.c	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/skproc.c	2006-03-22 09:09:56.000000000 +0000
 @@ -2,26 +2,33 @@
   *
   * Name:	skproc.c
@@ -31216,9 +31216,9 @@
  {   
  #define MAX_LEN_SINGLE_LINE 256
  	char     str[MAX_LEN_SINGLE_LINE];
-diff -ruN linux/drivers/net/sk98lin/skqueue.c linux-new/drivers/net/sk98lin/skqueue.c
---- linux/drivers/net/sk98lin/skqueue.c	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/skqueue.c	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/skqueue.c linux-2.4.33/drivers/net/sk98lin/skqueue.c
+--- linux-2.4.33.old/drivers/net/sk98lin/skqueue.c	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/skqueue.c	2006-03-22 09:09:55.000000000 +0000
 @@ -2,6 +2,8 @@
   *
   * Name:	skqueue.c
@@ -31388,9 +31388,9 @@
  			return(Rtv);
  		}
  
-diff -ruN linux/drivers/net/sk98lin/skrlmt.c linux-new/drivers/net/sk98lin/skrlmt.c
---- linux/drivers/net/sk98lin/skrlmt.c	2004-04-14 13:05:30.000000000 +0000
-+++ linux-new/drivers/net/sk98lin/skrlmt.c	2006-03-22 09:09:55.000000000 +0000
+diff -uNr linux-2.4.33.old/drivers/net/sk98lin/skrlmt.c linux-2.4.33/drivers/net/sk98lin/skrlmt.c
+--- linux-2.4.33.old/drivers/net/sk98lin/skrlmt.c	2004-04-14 13:05:30.000000000 +0000
++++ linux-2.4.33/drivers/net/sk98lin/skrlmt.c	2006-03-22 09:09:55.000000000 +0000
 @@ -2,12 +2,15 @@
   *
   * Name:	skrlmt.c
@@ -32395,9 +32395,9 @@
  		SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_RLMT_E003, SKERR_RLMT_E003_MSG);
  		break;
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/sk98lin_v8.40.2.3_2.4.33_patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list