diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 23:21:04 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 23:21:04 +0300 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /firmware/Makefile | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| download | linux-988addf82e4c03739375279de73929580a2d4a6a.tar.xz | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
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 1c00d05578f7..8af0fc7210b1 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 |