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/ps3/ps3-sys-manager.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/ps3/ps3-sys-manager.c')
| -rw-r--r-- | drivers/ps3/ps3-sys-manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ps3/ps3-sys-manager.c b/drivers/ps3/ps3-sys-manager.c index 88cb74088611..3cbaf1811bd0 100644 --- a/drivers/ps3/ps3-sys-manager.c +++ b/drivers/ps3/ps3-sys-manager.c | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | /** | 46 | /** |
| 47 | * struct ps3_sys_manager_header - System manager message header. | 47 | * struct ps3_sys_manager_header - System manager message header. |
| 48 | * @version: Header version, currently 1. | 48 | * @version: Header version, currently 1. |
| 49 | * @size: Header size in bytes, curently 16. | 49 | * @size: Header size in bytes, currently 16. |
| 50 | * @payload_size: Message payload size in bytes. | 50 | * @payload_size: Message payload size in bytes. |
| 51 | * @service_id: Message type, one of enum ps3_sys_manager_service_id. | 51 | * @service_id: Message type, one of enum ps3_sys_manager_service_id. |
| 52 | * @request_tag: Unique number to identify reply. | 52 | * @request_tag: Unique number to identify reply. |