diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-06 14:37:32 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-06 14:37:32 -0700 |
| commit | 72e1e868ca8f14ef34c95e0e8b73f64b6acf5934 (patch) | |
| tree | d3bc99f121693ab8f09c03ea555254c9314ff98d /arch/x86/include/asm/bootparam.h | |
| parent | edb1daab8e91338b7e2a6c41faec695891ccda35 (diff) | |
| parent | f9a37be0f02a943d63e3346b19f9c9d8d91826cb (diff) | |
Merge branch 'pci/mjg-pci-roms-from-efi' into next
* pci/mjg-pci-roms-from-efi:
x86: Use PCI setup data
PCI: Add support for non-BAR ROMs
PCI: Add pcibios_add_device
EFI: Stash ROMs if they're not in the PCI BAR
Diffstat (limited to 'arch/x86/include/asm/bootparam.h')
| -rw-r--r-- | arch/x86/include/asm/bootparam.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/bootparam.h b/arch/x86/include/asm/bootparam.h index 2ad874cb661..92862cd9020 100644 --- a/arch/x86/include/asm/bootparam.h +++ b/arch/x86/include/asm/bootparam.h @@ -13,6 +13,7 @@ #define SETUP_NONE 0 #define SETUP_E820_EXT 1 #define SETUP_DTB 2 +#define SETUP_PCI 3 /* extensible setup data list node */ struct setup_data { |