summaryrefslogtreecommitdiff
path: root/firmware/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-17 07:03:42 +0400
committerOlof Johansson <olof@lixom.net>2012-09-17 07:04:39 +0400
commita73403d85ab43ca633e393bb130add337d69fadb (patch)
treecce9d968bc915bc974f18ca0f4f05d6331288e7b /firmware/Makefile
parente640ca0fcb8b616c92a660605fddd1cc9e4bde1d (diff)
parentcdd86b277dc82220aa630414896505517a02a201 (diff)
downloadlinux-a73403d85ab43ca633e393bb130add337d69fadb.tar.xz
Merge branch 'depends/tty-omap-serial' into next/cleanup
This part of the tty tree (unfortunately with all the preceding patches as well) is a dependency for some of the OMAP cleanups, so we've pulled it in as a dependency based on agreement with Greg. Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'firmware/Makefile')
-rw-r--r--firmware/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/firmware/Makefile b/firmware/Makefile
index 344713b11669..fdc9ff045ef8 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -40,7 +40,6 @@ fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1a.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
fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
cxgb3/t3c_psram-1.1.0.bin \
cxgb3/t3fw-7.10.0.bin \