git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] md: allow SET_BITMAP_FILE to work on 64bit kernel with 32bit userspace
[pandora-kernel.git]
/
include
/
linux
/
elevator.h
diff --git
a/include/linux/elevator.h
b/include/linux/elevator.h
index
9c5a04f
..
b3370ef
100644
(file)
--- a/
include/linux/elevator.h
+++ b/
include/linux/elevator.h
@@
-3,6
+3,8
@@
#include <linux/percpu.h>
+#ifdef CONFIG_BLOCK
+
typedef int (elevator_merge_fn) (request_queue_t *, struct request **,
struct bio *);
@@
-203,4
+205,5
@@
enum {
__val; \
})
+#endif /* CONFIG_BLOCK */
#endif