projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (patches from Andrew)
[linux-2.6-block.git]
/
drivers
/
block
/
drbd
/
drbd_bitmap.c
diff --git
a/drivers/block/drbd/drbd_bitmap.c
b/drivers/block/drbd/drbd_bitmap.c
index 3dc53a16ed3aaf14dfd30311c16e0dc14f6623a0..9462d27528507d693d8e4efe0e6464597ab1768b 100644
(file)
--- a/
drivers/block/drbd/drbd_bitmap.c
+++ b/
drivers/block/drbd/drbd_bitmap.c
@@
-29,7
+29,7
@@
#include <linux/string.h>
#include <linux/drbd.h>
#include <linux/slab.h>
-#include <
asm/kmap_types
.h>
+#include <
linux/highmem
.h>
#include "drbd_int.h"