Merge branch 'upstream-merged'

1 files changed, 15 insertions, 0 deletions

diff --git a/libdde-linux26/contrib/include/asm-generic/bitops/find.h b/libdde-linux26/contrib/include/asm-generic/bitops/find.h
new file mode 100644
index 00000000..1914e974
--- /dev/null
+++ b/libdde-linux26/contrib/include/asm-generic/bitops/find.h
@@ -0,0 +1,15 @@
+#ifndef _ASM_GENERIC_BITOPS_FIND_H_
+#define _ASM_GENERIC_BITOPS_FIND_H_
+
+#ifndef CONFIG_GENERIC_FIND_NEXT_BIT
+extern unsigned long find_next_bit(const unsigned long *addr, unsigned long
+		size, unsigned long offset);
+
+extern unsigned long find_next_zero_bit(const unsigned long *addr, unsigned
+		long size, unsigned long offset);
+#endif
+
+#define find_first_bit(addr, size) find_next_bit((addr), (size), 0)
+#define find_first_zero_bit(addr, size) find_next_zero_bit((addr), (size), 0)
+
+#endif /*_ASM_GENERIC_BITOPS_FIND_H_ */