Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/usb/cdc_ether.c All CDC ethernet devices of type USB_CLASS_COMM need to use '&mbm_info'. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -69,11 +69,13 @@ fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
|
||||
fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin
|
||||
fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \
|
||||
cis/DP83903.cis cis/NE2K.cis \
|
||||
cis/tamarack.cis
|
||||
cis/tamarack.cis cis/PE-200.cis
|
||||
fw-shipped-$(CONFIG_PCMCIA_3C589) += cis/3CXEM556.cis
|
||||
fw-shipped-$(CONFIG_PCMCIA_3C574) += cis/3CCFEM556.cis
|
||||
fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
|
||||
cis/COMpad2.cis cis/COMpad4.cis
|
||||
cis/COMpad2.cis cis/COMpad4.cis \
|
||||
cis/SW_555_SER.cis cis/SW_7xx_SER.cis \
|
||||
cis/SW_8xx_SER.cis
|
||||
fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin
|
||||
fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \
|
||||
advansys/3550.bin advansys/38C0800.bin
|
||||
|
@@ -600,6 +600,7 @@ File: cis/LA-PCM.cis
|
||||
cis/DP83903.cis
|
||||
cis/NE2K.cis
|
||||
cis/tamarack.cis
|
||||
cis/PE-200.cis
|
||||
|
||||
Licence: GPL
|
||||
|
||||
@@ -633,6 +634,9 @@ File: cis/MT5634ZLX.cis
|
||||
cis/RS-COM-2P.cis
|
||||
cis/COMpad2.cis
|
||||
cis/COMpad4.cis
|
||||
cis/SW_555_SER.cis
|
||||
cis/SW_7xx_SER.cis
|
||||
cis/SW_8xx_SER.cis
|
||||
|
||||
Licence: GPL
|
||||
|
||||
|
9
firmware/cis/PE-200.cis.ihex
Normal file
9
firmware/cis/PE-200.cis.ihex
Normal file
@@ -0,0 +1,9 @@
|
||||
:1000000001030000FF151E0401504D582020200060
|
||||
:1000100050452D3230300045544845524E4554002D
|
||||
:1000200052303100FF210206031A050101000101CF
|
||||
:100030001B0EC181190155E051000F100F30FFFF59
|
||||
:040040001400FF00A9
|
||||
:00000001FF
|
||||
#
|
||||
# Replacement CIS for PE-200 ethernet card
|
||||
#
|
12
firmware/cis/SW_555_SER.cis.ihex
Normal file
12
firmware/cis/SW_555_SER.cis.ihex
Normal file
@@ -0,0 +1,12 @@
|
||||
:100000000101FF17034100FF20043F0110072102F7
|
||||
:100010000200152A070053696572726120576972E0
|
||||
:10002000656C657373004169724361726420353594
|
||||
:1000300035004135353500526576203100FF1A050F
|
||||
:1000400001030007731B0BE00118A360F8030730DE
|
||||
:10005000BC3F1B08A10108A360F802071B08A2010E
|
||||
:1000600008A360E803071B08A30108A360E80207D0
|
||||
:0A0070001B04A40108231400FF0084
|
||||
:00000001FF
|
||||
#
|
||||
# Replacement CIS for AC555 provided by Sierra Wireless
|
||||
#
|
13
firmware/cis/SW_7xx_SER.cis.ihex
Normal file
13
firmware/cis/SW_7xx_SER.cis.ihex
Normal file
@@ -0,0 +1,13 @@
|
||||
:100000000101FF17034100FF2004920110072102A4
|
||||
:1000100002001537070053696572726120576972D3
|
||||
:10002000656C6573730041433731302F4143373579
|
||||
:10003000300047505253204E6574776F726B2041E9
|
||||
:1000400064617074657200523100FF1A050103008B
|
||||
:1000500007731B10E00119784D555D25A360F80367
|
||||
:100060000730BC861B08A10108A360F802071B0823
|
||||
:10007000A20108A360E803071B08A30108A360E826
|
||||
:0C00800002071B04A40108231400FF0069
|
||||
:00000001FF
|
||||
#
|
||||
# Replacement CIS for AC7xx provided by Sierra Wireless
|
||||
#
|
13
firmware/cis/SW_8xx_SER.cis.ihex
Normal file
13
firmware/cis/SW_8xx_SER.cis.ihex
Normal file
@@ -0,0 +1,13 @@
|
||||
:100000000101FF17034100FF2004920110072102A4
|
||||
:100010000200152F070053696572726120576972DB
|
||||
:10002000656C657373004143383530003347204EAB
|
||||
:100030006574776F726B20416461707465720052F1
|
||||
:100040003100FF1A0501030007731B10E001197846
|
||||
:100050004D555D25A360F8480730BC861B08A101FB
|
||||
:1000600008A360F847071B08A20108A360E8480737
|
||||
:100070001B08A30108A360E847071B04A401082389
|
||||
:040080001400FF0069
|
||||
:00000001FF
|
||||
#
|
||||
# Replacement CIS for AC8xx provided by Sierra Wireless
|
||||
#
|
Reference in New Issue
Block a user