summaryrefslogtreecommitdiff
path: root/include/asm-arm
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-11-15 23:13:40 +0100
committerWolfgang Denk <wd@denx.de>2009-11-15 23:13:40 +0100
commit06f43286c6354aaab0103615e83893512f86eee7 (patch)
treec0c6bc4819fa381a9e1a2a051492eb4813bd410b /include/asm-arm
parentc758e947aa7d39a2be607ecdedd818ad300807b2 (diff)
parent3c014f1586d5bfe30dca7549396915c83f31cd30 (diff)
downloadu-boot-06f43286c6354aaab0103615e83893512f86eee7.tar.gz
Merge branch 'master' into next
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/unaligned.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-arm/unaligned.h b/include/asm-arm/unaligned.h
index d644df7526..44593a8949 100644
--- a/include/asm-arm/unaligned.h
+++ b/include/asm-arm/unaligned.h
@@ -1,7 +1,8 @@
#ifndef _ASM_ARM_UNALIGNED_H
#define _ASM_ARM_UNALIGNED_H
-#include <linux/unaligned/access_ok.h>
+#include <linux/unaligned/le_byteshift.h>
+#include <linux/unaligned/be_byteshift.h>
#include <linux/unaligned/generic.h>
/*