Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[mv-sheeva.git] / firmware / Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index 69779d1637e143a4a4c0c6d636bd89a933c2ab0f..0a9d1e28ad2399a46e69c5569c85ab8c6fc6c73b 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -35,10 +35,10 @@ fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
 fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.5.0.fw \
                              bnx2x/bnx2x-e1h-6.2.5.0.fw \
                              bnx2x/bnx2x-e2-6.2.5.0.fw
-fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.0.17.fw \
+fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1.fw \
                             bnx2/bnx2-rv2p-09-6.0.17.fw \
                             bnx2/bnx2-rv2p-09ax-6.0.17.fw \
-                            bnx2/bnx2-mips-06-6.0.15.fw \
+                            bnx2/bnx2-mips-06-6.2.1.fw \
                             bnx2/bnx2-rv2p-06-6.0.15.fw
 fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
 fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin