diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/s390/cio/chp.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/s390/cio/chp.c')
| -rw-r--r-- | drivers/s390/cio/chp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c index 8ab51608da55..1d16189f2f2d 100644 --- a/drivers/s390/cio/chp.c +++ b/drivers/s390/cio/chp.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/wait.h> | 15 | #include <linux/wait.h> |
| 16 | #include <linux/mutex.h> | 16 | #include <linux/mutex.h> |
| 17 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <asm/chpid.h> | 19 | #include <asm/chpid.h> |
| 19 | #include <asm/sclp.h> | 20 | #include <asm/sclp.h> |
| 20 | #include <asm/crw.h> | 21 | #include <asm/crw.h> |
| @@ -65,7 +66,7 @@ static void set_chp_logically_online(struct chp_id chpid, int onoff) | |||
| 65 | chpid_to_chp(chpid)->state = onoff; | 66 | chpid_to_chp(chpid)->state = onoff; |
| 66 | } | 67 | } |
| 67 | 68 | ||
| 68 | /* On succes return 0 if channel-path is varied offline, 1 if it is varied | 69 | /* On success return 0 if channel-path is varied offline, 1 if it is varied |
| 69 | * online. Return -ENODEV if channel-path is not registered. */ | 70 | * online. Return -ENODEV if channel-path is not registered. */ |
| 70 | int chp_get_status(struct chp_id chpid) | 71 | int chp_get_status(struct chp_id chpid) |
| 71 | { | 72 | { |