diff options
| author | Tom Rini <trini@ti.com> | 2014-02-26 16:49:58 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-02-26 16:49:58 -0500 |
| commit | eeb72e67619b98d2502fe634a3a5d9953de92ad0 (patch) | |
| tree | edea4b04062ec956158c163b13c9a31fcfdccde8 /fs | |
| parent | 715b56fe2b47e073e6f2425e0cedba0e92a4014d (diff) | |
| parent | 1551df35f296f0a8df32f4f2054254f46e8be252 (diff) | |
| download | u-boot-imx-eeb72e67619b98d2502fe634a3a5d9953de92ad0.zip u-boot-imx-eeb72e67619b98d2502fe634a3a5d9953de92ad0.tar.gz u-boot-imx-eeb72e67619b98d2502fe634a3a5d9953de92ad0.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
arch/arm/cpu/armv7/config.mk
board/ti/am43xx/mux.c
include/configs/am43xx_evm.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ubifs/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ubifs/Makefile b/fs/ubifs/Makefile index 6b1a9a5..8c8c6ac 100644 --- a/fs/ubifs/Makefile +++ b/fs/ubifs/Makefile @@ -13,6 +13,3 @@ obj-y := ubifs.o io.o super.o sb.o master.o lpt.o obj-y += lpt_commit.o scan.o lprops.o obj-y += tnc.o tnc_misc.o debug.o crc16.o budget.o obj-y += log.o orphan.o recovery.o replay.o - -# SEE README.arm-unaligned-accesses -CFLAGS_super.o := $(PLATFORM_NO_UNALIGNED) |