r1246 - in trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian: . patches

[Simon Horman]

Author: horms
Date: 2004-08-18 21:19:23 -0600 (Wed, 18 Aug 2004)
New Revision: 1246

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
Log:
The tg3 firmware removal change requires CONFIG_FW_LOADER

Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog	2004-08-19 00:37:06 UTC (rev 1245)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog	2004-08-19 03:19:23 UTC (rev 1246)
@@ -188,9 +188,11 @@
   * Remove non-free firmware blob from tg3.c. Post-sarge, this will be
     done with a new orig tarball, per consultation with Steve Langasek
     and Joshua Kwan.
+    N.B: This change requires CONFIG_FW_LOADER and in turn 
+    CONFIG_EXPERIMENTAL to be enabled for the tg3 driver to be compiled.
   * Merge in some trivial patches from kernel-image-sparc-2.4.
 
- -- Simon Horman <horms@debian.org>  Sat, 14 Aug 2004 15:04:50 +0900
+ -- Simon Horman <horms@debian.org>  Thu, 19 Aug 2004 12:11:45 +0900
 
 kernel-source-2.4.26 (2.4.26-5) unstable; urgency=high
 

Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-19 00:37:06 UTC (rev 1245)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-19 03:19:23 UTC (rev 1246)
@@ -19571,6 +19571,26 @@
  
 Enable I2C for sparc64 to resolve module dep issues.
 
+# The tg3 firmware patch above reqires CONFIG_FW_LOADER
+# Horms 19/08/2004
+--- a/drivers/net/Config.in	2004-08-19 12:07:17.000000000 +0900
++++ b/drivers/net/Config.in	2004-08-19 12:07:56.000000000 +0900
+@@ -268,7 +268,11 @@
+ dep_tristate 'Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)' CONFIG_YELLOWFIN $CONFIG_PCI $CONFIG_EXPERIMENTAL
+ dep_tristate 'Realtek 8169 Gigabit Ethernet support' CONFIG_R8169 $CONFIG_PCI
+ dep_tristate 'Marvell Yukon Chipset / SysKonnect SK-98xx Support' CONFIG_SK98LIN $CONFIG_PCI
+-dep_tristate 'Broadcom Tigon3 support' CONFIG_TIGON3 $CONFIG_PCI
++
++if [ "$CONFIG_EXPERIMENTAL" = "y" -a \
++     "$CONFIG_HOTPLUG" = "y" ]; then
++	dep_tristate 'Broadcom Tigon3 support' CONFIG_TIGON3 $CONFIG_PCI $CONFIG_FW_LOADER
++fi
+ 
+ if [ "$CONFIG_MOMENCO_OCELOT_C" = "y" -o "$CONFIG_MOMENCO_JAGUAR_ATX" = "y" ]; then
+    bool '  MV-64340 Ethernet support' CONFIG_MV64340_ETH
+
+# Sparc changes from Joshua Kwan
+# Horms 15/08/2004
 --- kernel-source-2.4.26/arch/sparc64/config.in~	2004-04-19 12:13:17.000000000 -0400
 +++ kernel-source-2.4.26/arch/sparc64/config.in	2004-04-19 12:13:39.000000000 -0400
 @@ -21,6 +21,8 @@