[kernel] r8101 - in dists/sid/linux-2.6/debian: . arch arch/amd64 arch/arm arch/i386 arch/mips arch/mipsel arch/sparc

[maximilian attems]

Author: maks-guest
Date: Fri Jan  5 00:48:37 2007
New Revision: 8101

Modified:
   dists/sid/linux-2.6/debian/arch/amd64/config
   dists/sid/linux-2.6/debian/arch/arm/config.footbridge
   dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/sid/linux-2.6/debian/arch/arm/config.versatile
   dists/sid/linux-2.6/debian/arch/config
   dists/sid/linux-2.6/debian/arch/i386/config
   dists/sid/linux-2.6/debian/arch/mips/config.r5k-ip32
   dists/sid/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
   dists/sid/linux-2.6/debian/arch/sparc/config.sparc32
   dists/sid/linux-2.6/debian/changelog
Log:
set SK98LIN to no in top config, cleanup similar setting.
skge is more powerful and they obviously clash pci ids.
explicitly disable it on amd64 and i386,
other archs should follow should do similar.


Modified: dists/sid/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/config	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/config	Fri Jan  5 00:48:37 2007
@@ -503,7 +503,6 @@
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
-CONFIG_SK98LIN=m
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m

Modified: dists/sid/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.footbridge	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.footbridge	Fri Jan  5 00:48:37 2007
@@ -680,7 +680,6 @@
 # CONFIG_R8169 is not set
 CONFIG_SIS190=m
 CONFIG_SKGE=m
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set

Modified: dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.ixp4xx	Fri Jan  5 00:48:37 2007
@@ -830,7 +830,6 @@
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 

Modified: dists/sid/linux-2.6/debian/arch/arm/config.versatile
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.versatile	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.versatile	Fri Jan  5 00:48:37 2007
@@ -780,7 +780,6 @@
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 

Modified: dists/sid/linux-2.6/debian/arch/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/config	(original)
+++ dists/sid/linux-2.6/debian/arch/config	Fri Jan  5 00:48:37 2007
@@ -124,6 +124,7 @@
 CONFIG_SENSORS_PCA9539=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_SKGE=m
+# CONFIG_SK98LIN is not set
 CONFIG_USB_GADGET_SELECTED=y
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_DVB_LGDT330X=m

Modified: dists/sid/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/config	Fri Jan  5 00:48:37 2007
@@ -644,7 +644,6 @@
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
 CONFIG_R8169_VLAN=y
-CONFIG_SK98LIN=m
 CONFIG_VIA_VELOCITY=m
 CONFIG_TIGON3=m
 CONFIG_BNX2=m

Modified: dists/sid/linux-2.6/debian/arch/mips/config.r5k-ip32
==============================================================================
--- dists/sid/linux-2.6/debian/arch/mips/config.r5k-ip32	(original)
+++ dists/sid/linux-2.6/debian/arch/mips/config.r5k-ip32	Fri Jan  5 00:48:37 2007
@@ -682,7 +682,6 @@
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
 

Modified: dists/sid/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
==============================================================================
--- dists/sid/linux-2.6/debian/arch/mipsel/config.r5k-cobalt	(original)
+++ dists/sid/linux-2.6/debian/arch/mipsel/config.r5k-cobalt	Fri Jan  5 00:48:37 2007
@@ -761,7 +761,6 @@
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set

Modified: dists/sid/linux-2.6/debian/arch/sparc/config.sparc32
==============================================================================
--- dists/sid/linux-2.6/debian/arch/sparc/config.sparc32	(original)
+++ dists/sid/linux-2.6/debian/arch/sparc/config.sparc32	Fri Jan  5 00:48:37 2007
@@ -73,7 +73,6 @@
 # CONFIG_DRM is not set
 # CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_TIGON3 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_IXGB is not set
 # CONFIG_SUN_VIDEOPIX is not set
 # CONFIG_VIDEO_DEV is not set

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Jan  5 00:48:37 2007
@@ -131,6 +131,8 @@
     patch from Leonard Norrgard <leonard.norrgard at refactor.fi>
   * tulip: Add i386 specific patch to remove duplicate pci ids.
     Thanks Jurij Smakov <jurij at wooyd.org> (closes: #334104, #405203)
+  * amd64, i386: Disable SK98LIN as SKGE is the modern capable driver.
+    (closes: 405196)
 
   [ Jurij Smakov ]
   * Add bugfix/sparc/isa-dev-no-reg.patch to make sure that
@@ -142,7 +144,7 @@
     memory accesses in ehci-hub-control() by adding an alignment attribute
     to the tbuf array declaration. Thanks to David Miller for the patch.
 
- -- maximilian attems <maks at sternwelten.at>  Fri,  5 Jan 2007 00:32:17 +0100
+ -- maximilian attems <maks at sternwelten.at>  Fri,  5 Jan 2007 00:46:22 +0100
 
 linux-2.6 (2.6.18-8) unstable; urgency=low