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
Merge branch 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
[pandora-kernel.git]
/
drivers
/
s390
/
block
/
dasd_int.h
diff --git
a/drivers/s390/block/dasd_int.h
b/drivers/s390/block/dasd_int.h
index
9f52004
..
dc5dd50
100644
(file)
--- a/
drivers/s390/block/dasd_int.h
+++ b/
drivers/s390/block/dasd_int.h
@@
-474,7
+474,7
@@
extern struct dasd_profile_info_t dasd_global_profile;
extern unsigned int dasd_profile_level;
extern struct block_device_operations dasd_device_operations;
extern unsigned int dasd_profile_level;
extern struct block_device_operations dasd_device_operations;
-extern
kmem_cache_t
*dasd_page_cache;
+extern
struct kmem_cache
*dasd_page_cache;
struct dasd_ccw_req *
dasd_kmalloc_request(char *, int, int, struct dasd_device *);
struct dasd_ccw_req *
dasd_kmalloc_request(char *, int, int, struct dasd_device *);