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

[Simon Horman]

Author: horms
Date: 2004-08-19 00:09:17 -0600 (Thu, 19 Aug 2004)
New Revision: 1250

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:
Update to tg3 config foo

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 04:09:18 UTC (rev 1249)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog	2004-08-19 06:09:17 UTC (rev 1250)
@@ -188,17 +188,18 @@
   * 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.
+    N.B: This change requires CONFIG_CRC32 and CONFIG_FW_LOADER, the
+    later which in turn requires CONFIG_EXPERIMENTAL, for the tg3 driver 
+    to be compiled.
   * Merge in some trivial patches from kernel-image-sparc-2.4
     Joshua Kwan
   * Fix that allows us to compile for sparc32 using gcc-3.3.
     Joshua Kwan
     . Changeset 1.1447.4.7
     . arch/sparc/lib/copy_user.S
- 
- -- Joshua Kwan <joshk@triplehelix.org>  Wed, 18 Aug 2004 20:13:03 -0700
 
+ -- Simon Horman <horms@debian.org>  Thu, 19 Aug 2004 15:05:37 +0900
+
 kernel-source-2.4.26 (2.4.26-5) unstable; urgency=high
 
   * Cleaned up after the previous upload.  In particular, patch-2.4.26-3

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 04:09:18 UTC (rev 1249)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-19 06:09:17 UTC (rev 1250)
@@ -19571,19 +19571,23 @@
  
 Enable I2C for sparc64 to resolve module dep issues.
 
-# The tg3 firmware patch above reqires CONFIG_FW_LOADER
+# The tg3 firmware patch above reqires CONFIG_FW_LOADER and CONFIG_CRC32
+# This is a bit of overkill. But as the dependancies were not previously
+# there it seems prudent.
 # 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 @@
+@@ -268,7 +268,13 @@
  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
++     "$CONFIG_HOTPLUG" = "y" -a \
++     "$CONFIG_FW_LOADER" = "y" -o "$CONFIG_FW_LOADER" = "m" -a \
++     "$CONFIG_CRC32" = "y" -o "$CONFIG_CRC32" = "m" ]; then
++	dep_tristate 'Broadcom Tigon3 support' CONFIG_TIGON3 $CONFIG_PCI $CONFIG_FW_LOADER $CONFIG_CRC32
 +fi
  
  if [ "$CONFIG_MOMENCO_OCELOT_C" = "y" -o "$CONFIG_MOMENCO_JAGUAR_ATX" = "y" ]; then