diff options
author | David Vrabel <dv02@dv02pc01.europe.root.pri> | 2008-10-10 06:47:31 -0400 |
---|---|---|
committer | David Vrabel <dv02@dv02pc01.europe.root.pri> | 2008-10-10 06:47:31 -0400 |
commit | 99ee3a6d4577e7633c66304e4aefeca5489c8d5c (patch) | |
tree | 94dbf1db8b2efb6b4fdaf6fdaa86de655c64ff1c /include/linux/bitmap.h | |
parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
parent | edfa042c880f62848aa55b3e71e538fe383929da (diff) |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb into for-upstream
Diffstat (limited to 'include/linux/bitmap.h')
-rw-r--r-- | include/linux/bitmap.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h index 89781fd48859..5379913aca52 100644 --- a/include/linux/bitmap.h +++ b/include/linux/bitmap.h | |||
@@ -130,6 +130,7 @@ extern void bitmap_fold(unsigned long *dst, const unsigned long *orig, | |||
130 | extern int bitmap_find_free_region(unsigned long *bitmap, int bits, int order); | 130 | extern int bitmap_find_free_region(unsigned long *bitmap, int bits, int order); |
131 | extern void bitmap_release_region(unsigned long *bitmap, int pos, int order); | 131 | extern void bitmap_release_region(unsigned long *bitmap, int pos, int order); |
132 | extern int bitmap_allocate_region(unsigned long *bitmap, int pos, int order); | 132 | extern int bitmap_allocate_region(unsigned long *bitmap, int pos, int order); |
133 | extern void bitmap_copy_le(void *dst, const unsigned long *src, int nbits); | ||
133 | 134 | ||
134 | #define BITMAP_LAST_WORD_MASK(nbits) \ | 135 | #define BITMAP_LAST_WORD_MASK(nbits) \ |
135 | ( \ | 136 | ( \ |