diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/s390/cio/chp.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/s390/cio/chp.c')
| -rw-r--r-- | drivers/s390/cio/chp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c index 8ab51608da55..c268a2e5b7c3 100644 --- a/drivers/s390/cio/chp.c +++ b/drivers/s390/cio/chp.c | |||
| @@ -65,7 +65,7 @@ static void set_chp_logically_online(struct chp_id chpid, int onoff) | |||
| 65 | chpid_to_chp(chpid)->state = onoff; | 65 | chpid_to_chp(chpid)->state = onoff; |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | /* On succes return 0 if channel-path is varied offline, 1 if it is varied | 68 | /* 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. */ | 69 | * online. Return -ENODEV if channel-path is not registered. */ |
| 70 | int chp_get_status(struct chp_id chpid) | 70 | int chp_get_status(struct chp_id chpid) |
| 71 | { | 71 | { |