diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 11:57:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 11:57:00 -0700 |
| commit | 72992bc1fdbb7d6f5ede60e02fee87e81ef98ace (patch) | |
| tree | a24b6da35edd7b4a254a0ec920817c12da862bb0 /arch/x86/include/uapi/asm/bootparam.h | |
| parent | bad15f2c386d9978ffb5c555e7b10543ff9b4beb (diff) | |
| parent | 7d132055814ef17a6c7b69f342244c410a5e000f (diff) | |
| download | lwn-72992bc1fdbb7d6f5ede60e02fee87e81ef98ace.tar.gz lwn-72992bc1fdbb7d6f5ede60e02fee87e81ef98ace.zip | |
Merge 3.10-rc6 into staging-next
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/include/uapi/asm/bootparam.h')
| -rw-r--r-- | arch/x86/include/uapi/asm/bootparam.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h index 08744242b8d2..c15ddaf90710 100644 --- a/arch/x86/include/uapi/asm/bootparam.h +++ b/arch/x86/include/uapi/asm/bootparam.h @@ -6,7 +6,6 @@ #define SETUP_E820_EXT 1 #define SETUP_DTB 2 #define SETUP_PCI 3 -#define SETUP_EFI_VARS 4 /* ram_size flags */ #define RAMDISK_IMAGE_START_MASK 0x07FF |