diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-16 23:12:26 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-16 23:13:04 -0400 |
| commit | f4936639bc4a75218b5598ff69c52b9a8dd7f23d (patch) | |
| tree | 9c08fc81cb3d3e658ca7f8dc20a949496d9e6130 /firmware/Makefile | |
| parent | d1226e8f98f130918265fb5b4dddcb60b783eb34 (diff) | |
| parent | 11964f53eb4d9ce59a058be9999d9cfcb1ced878 (diff) | |
Merge tag 'omap-devel-am33xx-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
From Tony Lindgren:
From Paul Walmsley <paul@pwsan.com>:
AM33xx hwmod data and miscellaneous clock and hwmod fixes. AM33xx
should now boot on mainline after this is applied, according to
Vaibhav.
(The shortlog makes no sense here since it contains mostly the dependent
cleanups that are part of the preceding branches).
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'firmware/Makefile')
| -rw-r--r-- | firmware/Makefile | 1 |
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 \ | |||
| 40 | bnx2/bnx2-mips-06-6.2.1.fw \ | 40 | bnx2/bnx2-mips-06-6.2.1.fw \ |
| 41 | bnx2/bnx2-rv2p-06-6.0.15.fw | 41 | bnx2/bnx2-rv2p-06-6.0.15.fw |
| 42 | fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin | 42 | fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin |
| 43 | fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin | ||
| 44 | fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \ | 43 | fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \ |
| 45 | cxgb3/t3c_psram-1.1.0.bin \ | 44 | cxgb3/t3c_psram-1.1.0.bin \ |
| 46 | cxgb3/t3fw-7.10.0.bin \ | 45 | cxgb3/t3fw-7.10.0.bin \ |