diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-17 21:24:56 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-17 21:24:56 +0400 |
| commit | c43c1be0f7e0ac3d2fe1d4a5b37041c4c4463af1 (patch) | |
| tree | 618b5e8ac458258acc981e0aeeac6f232f14aaf8 /firmware/Makefile | |
| parent | e22146e610bb7aed63282148740ab1d1b91e1d90 (diff) | |
| parent | a3cf859321486f69506326146ab3e2fd15c05c3f (diff) | |
| download | linux-c43c1be0f7e0ac3d2fe1d4a5b37041c4c4463af1.tar.xz | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'firmware/Makefile')
| -rw-r--r-- | firmware/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index e4f2fb3d1917..9fe86041f86e 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -56,7 +56,7 @@ 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 \ +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 |