diff options
author | Carsten Otte <cotte@de.ibm.com> | 2006-01-06 03:19:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:49 -0500 |
commit | cfb1b55595a0dfd87b5849e8d0216c029f34445f (patch) | |
tree | 86d73bda5e9c82e70a4bdbacfac6be5644c8a987 /include | |
parent | 6810a2bce3aa6573faa9920487274f166fe95c6e (diff) |
[PATCH] s390: move s390_root_dev_* out of the cio layer
Extract the s390_root_dev_* functions from the common I/O layer as they are
also used by non-ccw device drivers.
Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-s390/ccwdev.h | 3 | ||||
-rw-r--r-- | include/asm-s390/s390_rdev.h | 15 |
2 files changed, 15 insertions, 3 deletions
diff --git a/include/asm-s390/ccwdev.h b/include/asm-s390/ccwdev.h index 3eb231af5d51..12456cb2f882 100644 --- a/include/asm-s390/ccwdev.h +++ b/include/asm-s390/ccwdev.h | |||
@@ -185,8 +185,5 @@ extern struct ccw_device *ccw_device_probe_console(void); | |||
185 | extern int _ccw_device_get_device_number(struct ccw_device *); | 185 | extern int _ccw_device_get_device_number(struct ccw_device *); |
186 | extern int _ccw_device_get_subchannel_number(struct ccw_device *); | 186 | extern int _ccw_device_get_subchannel_number(struct ccw_device *); |
187 | 187 | ||
188 | extern struct device *s390_root_dev_register(const char *); | ||
189 | extern void s390_root_dev_unregister(struct device *); | ||
190 | |||
191 | extern void *ccw_device_get_chp_desc(struct ccw_device *, int); | 188 | extern void *ccw_device_get_chp_desc(struct ccw_device *, int); |
192 | #endif /* _S390_CCWDEV_H_ */ | 189 | #endif /* _S390_CCWDEV_H_ */ |
diff --git a/include/asm-s390/s390_rdev.h b/include/asm-s390/s390_rdev.h new file mode 100644 index 000000000000..3ad78f2b9c48 --- /dev/null +++ b/include/asm-s390/s390_rdev.h | |||
@@ -0,0 +1,15 @@ | |||
1 | /* | ||
2 | * include/asm-s390/ccwdev.h | ||
3 | * | ||
4 | * Copyright (C) 2002,2005 IBM Deutschland Entwicklung GmbH, IBM Corporation | ||
5 | * Author(s): Cornelia Huck <cohuck@de.ibm.com> | ||
6 | * Carsten Otte <cotte@de.ibm.com> | ||
7 | * | ||
8 | * Interface for s390 root device | ||
9 | */ | ||
10 | |||
11 | #ifndef _S390_RDEV_H_ | ||
12 | #define _S390_RDEV_H_ | ||
13 | extern struct device *s390_root_dev_register(const char *); | ||
14 | extern void s390_root_dev_unregister(struct device *); | ||
15 | #endif /* _S390_RDEV_H_ */ | ||