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 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-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
df9f699
..
d1e4f2c
100644
(file)
--- a/
drivers/s390/block/dasd_int.h
+++ b/
drivers/s390/block/dasd_int.h
@@
-686,6
+686,9
@@
struct dasd_device *dasd_device_from_cdev(struct ccw_device *);
struct dasd_device *dasd_device_from_cdev_locked(struct ccw_device *);
struct dasd_device *dasd_device_from_devindex(int);
struct dasd_device *dasd_device_from_cdev_locked(struct ccw_device *);
struct dasd_device *dasd_device_from_devindex(int);
+void dasd_add_link_to_gendisk(struct gendisk *, struct dasd_device *);
+struct dasd_device *dasd_device_from_gendisk(struct gendisk *);
+
int dasd_parse(void);
int dasd_busid_known(const char *);
int dasd_parse(void);
int dasd_busid_known(const char *);