UBUNTU: SAUCE: (no-up) Remove keyspan files duplicated in linux-firmware

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

diff --git a/firmware/Makefile b/firmware/Makefile
index f5c279d8e9423da38083522aba86a08565ed8014..7480f3fb6792afd7f03825dc71f44d0656aced6b 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -69,25 +69,6 @@ fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
                                  emi26/bitstream.fw
 fw-shipped-$(CONFIG_USB_EMI62) += emi62/loader.fw emi62/bitstream.fw \
                                  emi62/spdif.fw emi62/midi.fw
-ifdef CONFIG_FIRMWARE_IN_KERNEL
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_MPR) += keyspan/mpr.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA18X) += keyspan/usa18x.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19) += keyspan/usa19.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19QI) += keyspan/usa19qi.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19QW) += keyspan/usa19qw.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA19W) += keyspan/usa19w.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28) += keyspan/usa28.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28XA) += keyspan/usa28xa.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28XB) += keyspan/usa28xb.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA28X) += keyspan/usa28x.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA49W) += keyspan/usa49w.fw
-fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_USA49WLC) += keyspan/usa49wlc.fw
-else
-fw-shipped- += keyspan/mpr.fw keyspan/usa18x.fw keyspan/usa19.fw       \
-       keyspan/usa19qi.fw keyspan/usa19qw.fw keyspan/usa19w.fw         \
-       keyspan/usa28.fw keyspan/usa28xa.fw keyspan/usa28xb.fw          \
-       keyspan/usa28x.fw keyspan/usa49w.fw keyspan/usa49wlc.fw
-endif
 fw-shipped-$(CONFIG_USB_SERIAL_WHITEHEAT) += whiteheat_loader.fw whiteheat.fw \
                                           # whiteheat_loader_debug.fw
 fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw