SOURCES (LINUX_2_6): linux-2.6-sk98lin_8.41.2.3.patch - fixes for ...

[mguevara]

Author: mguevara                     Date: Mon Apr 30 14:57:33 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- fixes for 2.6.21

---- Files affected:
SOURCES:
   linux-2.6-sk98lin_8.41.2.3.patch (1.1.2.1 -> 1.1.2.1.4.1) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-sk98lin_8.41.2.3.patch
diff -u SOURCES/linux-2.6-sk98lin_8.41.2.3.patch:1.1.2.1 SOURCES/linux-2.6-sk98lin_8.41.2.3.patch:1.1.2.1.4.1
--- SOURCES/linux-2.6-sk98lin_8.41.2.3.patch:1.1.2.1	Mon Jan  8 09:32:52 2007
+++ SOURCES/linux-2.6-sk98lin_8.41.2.3.patch	Mon Apr 30 16:57:27 2007
@@ -40,8 +40,8 @@
 +# History:
 +#
 +#	$Log$
-+#	Revision 1.1.2.1  2007/01/08 08:32:52  mguevara
-+#	- 2.6.20-rc4 work in progress (suspend2 broken btw)
++#	Revision 1.1.2.1.4.1  2007/04/30 14:57:27  mguevara
++#	- fixes for 2.6.21
 +#	
 +#	Revision 1.1.4.2  2006/08/28 12:44:39  mlindner
 +#	Add: install.sh script handling added
@@ -20956,7 +20956,7 @@
  	for (i=0; i < size; ) {
  		l = (long) *p;
  		hex_buffer[haddr] = HEXCHAR[(l >> 28) & 0xf];
-@@ -4815,386 +6541,9 @@
+@@ -4815,389 +6541,9 @@
  
  #endif
  
@@ -21333,6 +21333,9 @@
 -
 -static int __init skge_init(void)
 -{
+-	printk(KERN_NOTICE "sk98lin: driver has been replaced by the skge driver"
+-	       " and is scheduled for removal\n");
+-
 -	return pci_register_driver(&skge_driver);
 -}
 -
@@ -54909,20 +54912,22 @@
 diff -ruN linux/drivers/net/Kconfig linux-new/drivers/net/Kconfig
 --- linux/drivers/net/Kconfig	2007-01-02 23:21:17.000000000 +0100
 +++ linux-new/drivers/net/Kconfig	2007-01-02 23:31:54.000000000 +0100
-@@ -2260,90 +2260,35 @@
+@@ -2260,92 +2260,35 @@
  	  To compile this driver as a module, choose M here: the module
  	  will be called sky2.  This is recommended.
  
 +
  config SK98LIN
- 	tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"
+ 	tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support (DEPRECATED)"
  	depends on PCI
  	---help---
  	  Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx
  	  compliant Gigabit Ethernet Adapter.
 -
--	  This driver supports the original Yukon chipset. A cleaner driver is 
--	  also available (skge) which seems to work better than this one.
+-	  This driver supports the original Yukon chipset. This driver is
+-	  deprecated and will be removed from the kernel in the near future,
+-	  it has been replaced by the skge driver. skge is cleaner and
+-	  seems to work better.
 -
 -	  This driver does not support the newer Yukon2 chipset. A separate
 -	  driver, sky2, is provided to support Yukon2-based adapters.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-sk98lin_8.41.2.3.patch?r1=1.1.2.1&r2=1.1.2.1.4.1&f=u