git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
message
/
i2o
/
i2o_block.h
diff --git
a/drivers/message/i2o/i2o_block.h
b/drivers/message/i2o/i2o_block.h
index
4fdaa5b
..
67f921b
100644
(file)
--- a/
drivers/message/i2o/i2o_block.h
+++ b/
drivers/message/i2o/i2o_block.h
@@
-64,7
+64,7
@@
/* I2O Block OSM mempool struct */
struct i2o_block_mempool {
/* I2O Block OSM mempool struct */
struct i2o_block_mempool {
-
kmem_cache_t
*slab;
+
struct kmem_cache
*slab;
mempool_t *pool;
};
mempool_t *pool;
};
@@
-96,7
+96,7
@@
struct i2o_block_request {
/* I2O Block device delayed request */
struct i2o_block_delayed_request {
/* I2O Block device delayed request */
struct i2o_block_delayed_request {
- struct
work_struct
work;
+ struct
delayed_work
work;
struct request_queue *queue;
};
struct request_queue *queue;
};