[kernel] r11673 - dists/trunk/linux-2.6/debian/patches/features/all

[Maximilian Attems]

Author: maks
Date: Sat Jun 21 08:05:20 2008
New Revision: 11673

Log:
fix acenic request_firmware() patch

we don't add the acenic firmwares to linux-2.6 so no need to add
their respective Kconfig variables, nuke them.

Modified:
   dists/trunk/linux-2.6/debian/patches/features/all/drivers-net-acenic-firmwar_request.patch

Modified: dists/trunk/linux-2.6/debian/patches/features/all/drivers-net-acenic-firmwar_request.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/drivers-net-acenic-firmwar_request.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/features/all/drivers-net-acenic-firmwar_request.patch	Sat Jun 21 08:05:20 2008
@@ -41,30 +41,6 @@
  	---help---
  	  Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear
  	  GA620, SGI Gigabit or Farallon PN9000-SX PCI Gigabit Ethernet
-@@ -1945,6 +1946,23 @@ config ACENIC_OMIT_TIGON_I
- 
- 	  The safe and default value for this is N.
- 
-+config ACENIC_TG1_FIRMWARE
-+	bool "Include firmware for old Tigon I based AceNICs"
-+	depends on ACENIC && !ACENIC_OMIT_TIGON_I
-+	---help---
-+	  This includes firmware for the original Alteon AceNIC and 3Com 3C985
-+	  (non B version) in the kernel image.
-+	  Say 'N' and let it get loaded from userspace on demand 
-+
-+config ACENIC_TG2_FIRMWARE
-+	bool "Include firmware for Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit"
-+	depends on ACENIC
-+	---help---
-+	  This includes firmware for later Alteon AceNIC, 3Com 3C985B,
-+	  NetGear GA620, SGI Gigabit or Farallon PN9000-SX PCI Gigabit
-+	  Ethernet adapter.
-+	  Say 'N' and let it get loaded from userspace on demand 
-+
- config DL2K
- 	tristate "DL2000/TC902x-based Gigabit Ethernet support"
- 	depends on PCI
 diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
 index 6c19265..1e42734 100644
 --- a/drivers/net/acenic.c