diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-04-28 06:00:36 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-04-28 06:00:36 -0400 |
| commit | 474a59610729a178cd3c9a6ab990da770b856c74 (patch) | |
| tree | 4b2967dee40ee4d7269fd0b2c59088b4d9bc1286 /include/uapi/linux | |
| parent | 8dc9abb93dde94e7f2bc719032fe16f5713df05c (diff) | |
| parent | 98810a6dcf8af768d7b0b71e5075ff9c199f5196 (diff) | |
Merge tag 'asoc-v3.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.15
A smattering of driver-specific fixes here, nothing generic. The Cirrus
CODEC conversions to devm_ are leak fixes - the conversion adds missing
error handling code.
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/hyperv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/hyperv.h b/include/uapi/linux/hyperv.h index 9beb7c991638..78e4a86030dd 100644 --- a/include/uapi/linux/hyperv.h +++ b/include/uapi/linux/hyperv.h | |||
| @@ -305,6 +305,7 @@ enum hv_kvp_exchg_pool { | |||
| 305 | #define HV_ERROR_DEVICE_NOT_CONNECTED 0x8007048F | 305 | #define HV_ERROR_DEVICE_NOT_CONNECTED 0x8007048F |
| 306 | #define HV_INVALIDARG 0x80070057 | 306 | #define HV_INVALIDARG 0x80070057 |
| 307 | #define HV_GUID_NOTFOUND 0x80041002 | 307 | #define HV_GUID_NOTFOUND 0x80041002 |
| 308 | #define HV_ERROR_ALREADY_EXISTS 0x80070050 | ||
| 308 | 309 | ||
| 309 | #define ADDR_FAMILY_NONE 0x00 | 310 | #define ADDR_FAMILY_NONE 0x00 |
| 310 | #define ADDR_FAMILY_IPV4 0x01 | 311 | #define ADDR_FAMILY_IPV4 0x01 |