diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-06 21:05:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-06 21:05:43 -0400 |
| commit | 3989203290fba6fdf6bc4825fbf6526e1bf17977 (patch) | |
| tree | 2fb2012e6136d3b8acbf10eaee6dce95afc6f781 /firmware/Makefile | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
| parent | 37efa239901493694a48f1d6f59f8de17c2c4509 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
b44: Use kernel DMA addresses for the kernel DMA API
forcedeth: Fix resume from hibernation regression.
xfrm: fix fragmentation on inter family tunnels
ibm_newemac: Fix dangerous struct assumption
gigaset: documentation update
gigaset: in file ops, check for device disconnect before anything else
bas_gigaset: use tasklet_hi_schedule for timing critical tasklets
net/802/fddi.c: add MODULE_LICENSE
smsc911x: remove unused #include <linux/version.h>
axnet_cs: fix phy_id detection for bogus Asix chip.
bnx2: Use request_firmware()
b44: Fix sizes passed to b44_sync_dma_desc_for_{device,cpu}()
socket: use percpu_add() while updating sockets_in_use
virtio_net: Set the mac config only when VIRITO_NET_F_MAC
myri_sbus: use request_firmware
e1000: fix loss of multicast packets
vxge: should include tcp.h
Conflict in firmware/WHENCE (SCSI vs net firmware)
Diffstat (limited to 'firmware/Makefile')
| -rw-r--r-- | firmware/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index 14fdd073c798..1e7fd4df16a7 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
| @@ -32,6 +32,10 @@ fw-shipped-$(CONFIG_ADAPTEC_STARFIRE) += adaptec/starfire_rx.bin \ | |||
| 32 | adaptec/starfire_tx.bin | 32 | adaptec/starfire_tx.bin |
| 33 | fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin | 33 | fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin |
| 34 | fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw | 34 | fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw |
| 35 | fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-4.6.17.fw \ | ||
| 36 | bnx2/bnx2-rv2p-09-4.6.15.fw \ | ||
| 37 | bnx2/bnx2-mips-06-4.6.16.fw \ | ||
| 38 | bnx2/bnx2-rv2p-06-4.6.16.fw | ||
| 35 | fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin | 39 | fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin |
| 36 | fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin | 40 | fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin |
| 37 | fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \ | 41 | fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \ |
| @@ -40,6 +44,7 @@ fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \ | |||
| 40 | fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin | 44 | fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin |
| 41 | fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \ | 45 | fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \ |
| 42 | e100/d102e_ucode.bin | 46 | e100/d102e_ucode.bin |
| 47 | fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin | ||
| 43 | fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin | 48 | fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin |
| 44 | fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \ | 49 | fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \ |
| 45 | advansys/3550.bin advansys/38C0800.bin | 50 | advansys/3550.bin advansys/38C0800.bin |