diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-08 23:17:32 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-08 23:17:32 -0800 |
| commit | ce67eef6a112bb283c6db39f9195800f31f5599a (patch) | |
| tree | 34f2e7fbd0b9838abba482dbb1a7db09e6fbb53c /firmware/Makefile | |
| parent | 776943fd6f104a6e8457dc95a17282e69e963666 (diff) | |
| parent | 57d54889cd00db2752994b389ba714138652e60c (diff) | |
Merge commit 'v2.6.34-rc1' into for-linus
Diffstat (limited to 'firmware/Makefile')
| -rw-r--r-- | firmware/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index 1c00d05578f..8af0fc7210b 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -32,11 +32,11 @@ fw-shipped-$(CONFIG_ADAPTEC_STARFIRE) += adaptec/starfire_rx.bin \ adaptec/starfire_tx.bin fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw -fw-shipped-$(CONFIG_BNX2X) += bnx2x-e1-5.2.7.0.fw bnx2x-e1h-5.2.7.0.fw -fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-5.0.0.j3.fw \ - bnx2/bnx2-rv2p-09-5.0.0.j3.fw \ - bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw \ - bnx2/bnx2-mips-06-5.0.0.j3.fw \ +fw-shipped-$(CONFIG_BNX2X) += bnx2x-e1-5.2.13.0.fw bnx2x-e1h-5.2.13.0.fw +fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-5.0.0.j9.fw \ + bnx2/bnx2-rv2p-09-5.0.0.j10.fw \ + bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw \ + bnx2/bnx2-mips-06-5.0.0.j6.fw \ bnx2/bnx2-rv2p-06-5.0.0.j3.fw fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin |