diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-07 07:15:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-07 07:15:46 -0400 |
| commit | 2fe5de9ce7d57498abc14b375cad2fcf8c3ee6cc (patch) | |
| tree | 9478e8cf470c1d5bdb2d89b57a7e35919ab95e72 /include/uapi/linux/capi.h | |
| parent | 08f8aeb55d7727d644dbbbbfb798fe937d47751d (diff) | |
| parent | 2b4cfe64dee0d84506b951d81bf55d9891744d25 (diff) | |
Merge branch 'sched/urgent' into sched/core, to avoid conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/capi.h')
| -rw-r--r-- | include/uapi/linux/capi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/capi.h b/include/uapi/linux/capi.h index 65100d6cb89b..7b145fd7afb6 100644 --- a/include/uapi/linux/capi.h +++ b/include/uapi/linux/capi.h | |||
| @@ -102,7 +102,7 @@ typedef struct capi_manufacturer_cmd { | |||
| 102 | 102 | ||
| 103 | /* | 103 | /* |
| 104 | * member contr is input for | 104 | * member contr is input for |
| 105 | * CAPI_GET_MANUFACTURER, CAPI_VERSION, CAPI_GET_SERIAL | 105 | * CAPI_GET_MANUFACTURER, CAPI_GET_VERSION, CAPI_GET_SERIAL |
| 106 | * and CAPI_GET_PROFILE | 106 | * and CAPI_GET_PROFILE |
| 107 | */ | 107 | */ |
| 108 | typedef union capi_ioctl_struct { | 108 | typedef union capi_ioctl_struct { |