diff options
| author | Greg Kroah-Hartman | 2011-08-29 17:47:46 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-08-29 17:47:46 +0200 |
| commit | 6eafa4604cfa109a89524d35d93df11c37bd66b0 (patch) | |
| tree | de0eddca052ed01318df559d7cd80211dd57a0fd /arch | |
| parent | Linux 3.1-rc4 (diff) | |
| parent | staging: fix rts5139 depends & build (diff) | |
| download | kernel-qcow2-linux-6eafa4604cfa109a89524d35d93df11c37bd66b0.tar.gz kernel-qcow2-linux-6eafa4604cfa109a89524d35d93df11c37bd66b0.tar.xz kernel-qcow2-linux-6eafa4604cfa109a89524d35d93df11c37bd66b0.zip | |
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')
| -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 @@ #define HV_STATUS_INVALID_HYPERCALL_CODE 2 #define HV_STATUS_INVALID_HYPERCALL_INPUT 3 #define HV_STATUS_INVALID_ALIGNMENT 4 +#define HV_STATUS_INSUFFICIENT_BUFFERS 19 #endif |