aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pci.h2
-rw-r--r--include/linux/usb/hcd.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index c446b5ca2d3..ff5970b7a17 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -174,6 +174,8 @@ enum pci_dev_flags {
174 PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG = (__force pci_dev_flags_t) 1, 174 PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG = (__force pci_dev_flags_t) 1,
175 /* Device configuration is irrevocably lost if disabled into D3 */ 175 /* Device configuration is irrevocably lost if disabled into D3 */
176 PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t) 2, 176 PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t) 2,
177 /* Device causes system crash if in D3 during S3 sleep */
178 PCI_DEV_FLAGS_NO_D3_DURING_SLEEP = (__force pci_dev_flags_t) 8,
177}; 179};
178 180
179enum pci_irq_reroute_variant { 181enum pci_irq_reroute_variant {
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 32ba8c55b3a..c0ecc5a2ef9 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -128,8 +128,6 @@ struct usb_hcd {
128 unsigned wireless:1; /* Wireless USB HCD */ 128 unsigned wireless:1; /* Wireless USB HCD */
129 unsigned authorized_default:1; 129 unsigned authorized_default:1;
130 unsigned has_tt:1; /* Integrated TT in root hub */ 130 unsigned has_tt:1; /* Integrated TT in root hub */
131 unsigned broken_pci_sleep:1; /* Don't put the
132 controller in PCI-D3 for system sleep */
133 131
134 int irq; /* irq allocated */ 132 int irq; /* irq allocated */
135 void __iomem *regs; /* device memory/io */ 133 void __iomem *regs; /* device memory/io */