x86/msr: Add definitions for new speculation control MSRs

[mirror_ubuntu-artful-kernel.git] / firmware / Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index 228e1f64bb4b5c46e4161907871b22088c8025a2..5ef759b68dec2e4fcfb965806acba84de2a6aeec 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -20,10 +20,9 @@ fw-external-y := $(subst $(quote),,$(CONFIG_EXTRA_FIRMWARE))
 # accurate. In the latter case it doesn't matter -- it'll use $(fw-shipped-all).
 # But be aware that the config file might not be included at all.
 
-fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
-fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-7.2.51.0.fw \
-                             bnx2x/bnx2x-e1h-7.2.51.0.fw \
-                             bnx2x/bnx2x-e2-7.2.51.0.fw
+fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-7.13.1.0.fw \
+                             bnx2x/bnx2x-e1h-7.13.1.0.fw \
+                             bnx2x/bnx2x-e2-7.13.1.0.fw
 fw-shipped-$(CONFIG_BNX2) +=   bnx2/bnx2-mips-09-6.2.1b.fw \
                                bnx2/bnx2-rv2p-06-6.0.15.fw \
                                bnx2/bnx2-mips-06-6.2.3.fw \
@@ -56,7 +55,6 @@ fw-shipped-$(CONFIG_USB_EMI62) += emi62/loader.fw emi62/bitstream.fw \
                                  emi62/spdif.fw emi62/midi.fw
 fw-shipped-$(CONFIG_USB_SERIAL_WHITEHEAT) += whiteheat_loader.fw whiteheat.fw \
                                           # whiteheat_loader_debug.fw
-fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw
 
 fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)