r1283 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches

[Joshua Kwan]

Author: joshk
Date: 2004-08-23 23:31:07 -0600 (Mon, 23 Aug 2004)
New Revision: 1283

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/066_dep_fw_loader.diff
Log:
a better 066_dep_fw_loader.diff


Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/066_dep_fw_loader.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/066_dep_fw_loader.diff	2004-08-24 04:28:02 UTC (rev 1282)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/066_dep_fw_loader.diff	2004-08-24 05:31:07 UTC (rev 1283)
@@ -1,26 +1,58 @@
---- a/drivers/net/wireless/Config.in	2004-08-18 23:01:07.000000000 -0700
-+++ b/drivers/net/wireless/Config.in	2004-08-18 23:03:35.000000000 -0700
-@@ -24,7 +24,9 @@
+--- 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,15 @@
  
     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
-+   if [ "$CONFIG_FW_LOADER" != "n" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then
++   # Check for some instance of FW_LOADER
++   if [ "$CONFIG_FW_LOADER" = "y" -o "$CONFIG_FW_LOADER" = "m" ]; then
++      HAVE_SOME_FW_LOADER=y
++   fi
++   if [ "$HAVE_SOME_FW_LOADER" = "y" -a "$CONFIG_EXPERIMENTAL" = "y" ]; 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
---- a/drivers/net/Config.in	2004-08-18 20:30:57.000000000 -0700
-+++ b/drivers/net/Config.in	2004-08-18 23:03:18.000000000 -0700
-@@ -268,7 +268,10 @@
+--- 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
+@@ -184,7 +184,6 @@
+       fi
+       if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" ]; then
+          tristate '    Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5
+-         tristate '    Digi Intl. RightSwitch SE-X support' CONFIG_DGRS
+       fi
+       dep_tristate '    Davicom DM910x/DM980x support' CONFIG_DM9102 $CONFIG_PCI
+       dep_tristate '    EtherExpressPro/100 support (eepro100, original Becker driver)' CONFIG_EEPRO100 $CONFIG_PCI
+@@ -258,10 +257,6 @@
+ mainmenu_option next_comment
+ comment 'Ethernet (1000 Mbit)'
+ 
+-dep_tristate 'Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC $CONFIG_PCI
+-if [ "$CONFIG_ACENIC" != "n" ]; then
+-   bool '  Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I
+-fi
+ dep_tristate 'D-Link DL2000-based Gigabit Ethernet support' CONFIG_DL2K $CONFIG_PCI
+ dep_tristate 'Intel(R) PRO/1000 Gigabit Ethernet support' CONFIG_E1000 $CONFIG_PCI
+ if [ "$CONFIG_E1000" != "n" ]; then
+@@ -273,7 +268,17 @@
  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_FW_LOADER" != "n" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then
++# Check for some instance of FW_LOADER
++if [ "$CONFIG_FW_LOADER" = "y" -o "$CONFIG_FW_LOADER" = "m" ]; then
++   HAVE_SOME_FW_LOADER=y
++fi
++
++if [ "$HAVE_SOME_FW_LOADER" = "y" -a "$CONFIG_EXPERIMENTAL" = "y" ]; 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