diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-20 16:22:32 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-20 16:22:34 +0400 |
| commit | 6a991acceedce3ca93caef8ba7af2468c9451614 (patch) | |
| tree | 1997d71fc57bdebd12fc70a73070281614b52f15 /include/linux/usb/hcd.h | |
| parent | 70fb74a5420f9caa3e001d65004e4b669124283e (diff) | |
| parent | 485802a6c524e62b5924849dd727ddbb1497cc71 (diff) | |
| download | linux-6a991acceedce3ca93caef8ba7af2468c9451614.tar.xz | |
Merge commit 'v3.5-rc3' into x86/debug
Merge it in to pick up a fix that we are going to clean up in this
branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/usb/hcd.h')
| -rw-r--r-- | include/linux/usb/hcd.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h index 7f855d50cdf5..49b3ac29726a 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -126,8 +126,6 @@ struct usb_hcd { unsigned wireless:1; /* Wireless USB HCD */ unsigned authorized_default:1; unsigned has_tt:1; /* Integrated TT in root hub */ - unsigned broken_pci_sleep:1; /* Don't put the - controller in PCI-D3 for system sleep */ unsigned int irq; /* irq allocated */ void __iomem *regs; /* device memory/io */ |