diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:34:29 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:34:29 -0500 |
| commit | 78f098383a7abb1eb9dfd45346773fe80a65f05a (patch) | |
| tree | d9d3958960cefe5206fb2df9dff78aac450ec2c4 /include/uapi/linux | |
| parent | acc886ec934980a45ae8962dbe88e221a40c77a2 (diff) | |
| parent | e3adec72a3c50b733eb277a9f93c044f59ff55eb (diff) | |
| download | op-kernel-dev-78f098383a7abb1eb9dfd45346773fe80a65f05a.zip op-kernel-dev-78f098383a7abb1eb9dfd45346773fe80a65f05a.tar.gz | |
Merge branch 'pci/resource' into next
* pci/resource:
PCI: Don't resize resources when realigning all devices in system
PCI: Don't reassign resources that are already aligned
PCI: Factor pci_reassigndev_resource_alignment()
powerpc/powernv: Override pcibios_default_alignment() to force PCI devices to be page aligned
PCI: Add pcibios_default_alignment() for arch-specific alignment control
PCI: Fix calculation of bridge window's size and alignment
PCI: Ignore requested alignment for IOV BARs
PCI: Make PCI_ROM_ADDRESS_MASK a 32-bit constant
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/pci_regs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h index 634c9c4..fff521c 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h @@ -114,7 +114,7 @@ #define PCI_SUBSYSTEM_ID 0x2e #define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */ #define PCI_ROM_ADDRESS_ENABLE 0x01 -#define PCI_ROM_ADDRESS_MASK (~0x7ffUL) +#define PCI_ROM_ADDRESS_MASK (~0x7ffU) #define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */ |
