diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 11:47:46 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 11:47:46 -0400 |
| commit | 6eafa4604cfa109a89524d35d93df11c37bd66b0 (patch) | |
| tree | de0eddca052ed01318df559d7cd80211dd57a0fd /arch/x86/include/asm | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
| parent | b9c4decbd9530b0c4c6dc4ad0626af628b79cd53 (diff) | |
Merge 3.1-rc4 into staging-next
This resolves a conflict with:
drivers/staging/brcm80211/brcmsmac/types.h
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/hyperv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/hyperv.h b/arch/x86/include/asm/hyperv.h index 5df477ac3af7..b80420bcd09d 100644 --- a/arch/x86/include/asm/hyperv.h +++ b/arch/x86/include/asm/hyperv.h | |||
| @@ -189,5 +189,6 @@ | |||
| 189 | #define HV_STATUS_INVALID_HYPERCALL_CODE 2 | 189 | #define HV_STATUS_INVALID_HYPERCALL_CODE 2 |
| 190 | #define HV_STATUS_INVALID_HYPERCALL_INPUT 3 | 190 | #define HV_STATUS_INVALID_HYPERCALL_INPUT 3 |
| 191 | #define HV_STATUS_INVALID_ALIGNMENT 4 | 191 | #define HV_STATUS_INVALID_ALIGNMENT 4 |
| 192 | #define HV_STATUS_INSUFFICIENT_BUFFERS 19 | ||
| 192 | 193 | ||
| 193 | #endif | 194 | #endif |