From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 24 Aug 2012 06:02:06 +0000 (+1000)
Subject: Merge remote-tracking branch 'tty/tty-next'
X-Git-Tag: next-20120824~20
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e01344ada2f2e07b5b48b9b1f8782f15fed51367;p=karo-tx-linux.git

Merge remote-tracking branch 'tty/tty-next'
---

e01344ada2f2e07b5b48b9b1f8782f15fed51367
diff --cc firmware/Makefile
index 76628e32fed6,fdc9ff045ef8..eeb14030d8a2
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@@ -40,9 -40,9 +40,8 @@@ fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-
  			     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 \
  				   cxgb3/ael2005_opt_edc.bin \
  				   cxgb3/ael2005_twx_edc.bin \
  				   cxgb3/ael2020_twx_edc.bin