diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:17:41 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:17:41 -0700 |
commit | d3745f46e32d86de188cf378f923b7a2ed5274f9 (patch) | |
tree | b6ad64cbd41644de503a15ce3669e00ec602db8f /include/linux/pci.h | |
parent | 70d002bccac5e107fafb95e83fcb7fc010a88695 (diff) | |
parent | ffadcc2ff42ecedf71ea67d9051ff028927aed08 (diff) |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 of HEAD
* HEAD:
[PATCH] PCI: PCIE power management quirk
[PATCH] PCI: add PCI Express AER register definitions to pci_regs.h
[PATCH] PCI: Clear abnormal poweroff flag on VIA southbridges, fix resume
[PATCH] PCI: poper prototype for arch/i386/pci/pcbios.c:pcibios_sort()
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 983fca251b2..8565b81d7fb 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -161,6 +161,7 @@ struct pci_dev { unsigned int is_enabled:1; /* pci_enable_device has been called */ unsigned int is_busmaster:1; /* device is busmaster */ unsigned int no_msi:1; /* device may not use msi */ + unsigned int no_d1d2:1; /* only allow d0 or d3 */ unsigned int block_ucfg_access:1; /* userspace config space access is blocked */ unsigned int broken_parity_status:1; /* Device generates false positive parity */ unsigned int msi_enabled:1; |