projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
[cascardo/linux.git]
/
include
/
linux
/
iocontext.h
diff --git
a/include/linux/iocontext.h
b/include/linux/iocontext.h
index
1195a80
..
a0bb301
100644
(file)
--- a/
include/linux/iocontext.h
+++ b/
include/linux/iocontext.h
@@
-42,7
+42,7
@@
struct io_context {
unsigned short ioprio;
unsigned short ioprio_changed;
-#if
def CONFIG_BLK_CGROUP
+#if
defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE)
unsigned short cgroup_changed;
#endif