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. svn path=/dists/trunk/linux-2.6/; revision=11673
This commit is contained in:
parent
4736341ed9
commit
feae3cd5e9
|
@ -41,30 +41,6 @@ index f80c839..7677680 100644
|
||||||
---help---
|
---help---
|
||||||
Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear
|
Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear
|
||||||
GA620, SGI Gigabit or Farallon PN9000-SX PCI Gigabit Ethernet
|
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
|
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
|
||||||
index 6c19265..1e42734 100644
|
index 6c19265..1e42734 100644
|
||||||
--- a/drivers/net/acenic.c
|
--- a/drivers/net/acenic.c
|
||||||
|
|
Loading…
Reference in New Issue