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 'master' of git://git.denx.de/u-boot-video
[oweals/u-boot.git]
/
arch
/
sandbox
/
include
/
asm
/
bitops.h
diff --git
a/arch/sandbox/include/asm/bitops.h
b/arch/sandbox/include/asm/bitops.h
index e807c4ef34bda06b5f1d555bb248ea02fccf4390..f27d5e98c56033f1e8701d61f8a0ac1f1ac18646 100644
(file)
--- a/
arch/sandbox/include/asm/bitops.h
+++ b/
arch/sandbox/include/asm/bitops.h
@@
-1,6
+1,8
@@
/*
* Copyright (c) 2011 The Chromium OS Authors.
*
/*
* Copyright (c) 2011 The Chromium OS Authors.
*
+ * Modified from Linux arch/arm/include/asm/bitops.h
+ *
* Copyright 1995, Russell King.
* Various bits and pieces copyrights include:
* Linus Torvalds (test_bit).
* Copyright 1995, Russell King.
* Various bits and pieces copyrights include:
* Linus Torvalds (test_bit).
@@
-19,6
+21,10
@@
#include <linux/compiler.h>
#include <asm/system.h>
#include <linux/compiler.h>
#include <asm/system.h>
+#include <asm-generic/bitops/fls.h>
+#include <asm-generic/bitops/__fls.h>
+#include <asm-generic/bitops/fls64.h>
+#include <asm-generic/bitops/__ffs.h>
#ifdef __KERNEL__
#ifdef __KERNEL__