summaryrefslogtreecommitdiffstats
path: root/fs/ubifs
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-02-26 16:49:58 -0500
committerTom Rini <trini@ti.com>2014-02-26 16:49:58 -0500
commiteeb72e67619b98d2502fe634a3a5d9953de92ad0 (patch)
treeedea4b04062ec956158c163b13c9a31fcfdccde8 /fs/ubifs
parent715b56fe2b47e073e6f2425e0cedba0e92a4014d (diff)
parent1551df35f296f0a8df32f4f2054254f46e8be252 (diff)
downloadtalos-obmc-uboot-eeb72e67619b98d2502fe634a3a5d9953de92ad0.tar.gz
talos-obmc-uboot-eeb72e67619b98d2502fe634a3a5d9953de92ad0.zip
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/ubifs')
-rw-r--r--fs/ubifs/Makefile3
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ubifs/Makefile b/fs/ubifs/Makefile
index 6b1a9a5b00..8c8c6ac683 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)
OpenPOWER on IntegriCloud