projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2020-05-18-reduce-size-of-common.h'
[oweals/u-boot.git]
/
arch
/
arm
/
mach-mvebu
/
include
/
mach
/
soc.h
diff --git
a/arch/arm/mach-mvebu/include/mach/soc.h
b/arch/arm/mach-mvebu/include/mach/soc.h
index acb9257c90fe35f140c60dcda386da57a37f63e1..3f3b15aa8ab6a00bb83da88d50b73ae3d57a0605 100644
(file)
--- a/
arch/arm/mach-mvebu/include/mach/soc.h
+++ b/
arch/arm/mach-mvebu/include/mach/soc.h
@@
-10,6
+10,10
@@
#ifndef _MVEBU_SOC_H
#define _MVEBU_SOC_H
#ifndef _MVEBU_SOC_H
#define _MVEBU_SOC_H
+#ifndef __ASSEMBLY__
+#include <linux/bitops.h>
+#endif
+
#define SOC_MV78230_ID 0x7823
#define SOC_MV78260_ID 0x7826
#define SOC_MV78460_ID 0x7846
#define SOC_MV78230_ID 0x7823
#define SOC_MV78260_ID 0x7826
#define SOC_MV78460_ID 0x7846