r1462 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Joshua Kwan]

Author: joshk
Date: 2004-08-28 20:19:38 -0600 (Sat, 28 Aug 2004)
New Revision: 1462

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/071_dep_fw_loader-2.diff
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-5
Log:
better dep_fw_loader patch?


Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-08-28 23:36:59 UTC (rev 1461)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-08-29 02:19:38 UTC (rev 1462)
@@ -4,8 +4,10 @@
   * 070_ide_scan_pcibus.diff: Add this very crucial hunk of code that was
     missed while exploding the monolithic patchset into small diffs.
     (Closes: #266538, #266510)
+  * 071_dep_fw_loader-2.diff: Simplify 066_dep_fw_loader.diff (removed) so
+    that it works with make xconfig as well. (Closes: #268436)
 
- -- Joshua Kwan <joshk@triplehelix.org>  Sat, 28 Aug 2004 15:56:03 -0700
+ -- Joshua Kwan <joshk@triplehelix.org>  Sat, 28 Aug 2004 18:23:06 -0700
 
 kernel-source-2.4.27 (2.4.27-4) unstable; urgency=high
 

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/071_dep_fw_loader-2.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/071_dep_fw_loader-2.diff	2004-08-28 23:36:59 UTC (rev 1461)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/071_dep_fw_loader-2.diff	2004-08-29 02:19:38 UTC (rev 1462)
@@ -0,0 +1,33 @@
+--- kernel-source-2.4.27-2.4.27/drivers/net/wireless/Config.in~	2004-08-23 22:24:53.000000000 -0700
++++ kernel-source-2.4.27-2.4.27/drivers/net/wireless/Config.in	2004-08-23 22:29:52.000000000 -0700
+@@ -24,7 +24,12 @@
+ 
+    dep_tristate '  Hermes PCMCIA card support' CONFIG_PCMCIA_HERMES $CONFIG_HERMES
+    tristate '  Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards' CONFIG_AIRO_CS
+-   dep_tristate '  Atmel at76c502/at76c504 PCMCIA cards' CONFIG_PCMCIA_ATMEL $CONFIG_FW_LOADER
++   # Check for some instance of FW_LOADER
++   if [ "$CONFIG_FW_LOADER" = "y" -o "$CONFIG_FW_LOADER" = "m" ]; then
++     dep_tristate '  Atmel at76c502/at76c504 PCMCIA cards' CONFIG_PCMCIA_ATMEL $CONFIG_FW_LOADER
++   else
++     comment 'Need firmware loading support for Atmel cards'
++   fi
+ fi
+ 
+ # yes, this works even when no drivers are selected
+--- kernel-source-2.4.27-2.4.27/drivers/net/Config.in~	2004-08-23 22:24:46.000000000 -0700
++++ kernel-source-2.4.27-2.4.27/drivers/net/Config.in	2004-08-23 22:29:25.000000000 -0700
+@@ -273,7 +273,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
++
++# Check for some instance of FW_LOADER
++if [ "$CONFIG_FW_LOADER" = "y" -o "$CONFIG_FW_LOADER" = "m" ]; then
++   dep_tristate 'Broadcom Tigon3 support' CONFIG_TIGON3 $CONFIG_PCI $CONFIG_FW_LOADER
++else
++   comment 'Need firmware loading support for Broadcom Tigon3'
++fi
+ 
+ if [ "$CONFIG_MOMENCO_OCELOT_C" = "y" -o "$CONFIG_MOMENCO_JAGUAR_ATX" = "y" ]; then
+    bool '  MV-64340 Ethernet support' CONFIG_MV64340_ETH

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-5
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-5	2004-08-28 23:36:59 UTC (rev 1461)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-5	2004-08-29 02:19:38 UTC (rev 1462)
@@ -1 +1,3 @@
 + 070_ide_scan_pcibus.diff
+- 066_dep_fw_loader.diff
++ 071_dep_fw_loader-2.diff