diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2012-10-08 06:46:32 -0400 |
|---|---|---|
| committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-10-08 06:46:32 -0400 |
| commit | 102084d3d3969646cc89ea159e50898aeafc6649 (patch) | |
| tree | e92924469b3fab3ee6fa29e338e0a3a4cb167e82 /drivers/usb/host/pci-quirks.h | |
| parent | 6ccbe607132bd823abbad8d32b13af89161707da (diff) | |
| parent | 979570e02981d4a8fc20b3cc8fd651856c98ee9d (diff) | |
Merge tag 'v3.6-rc7' into i2c-embedded/for-next
Linux 3.6-rc7
Needed to get updates from i2c-embedded/for-current into i2c-embedded/for-next
Diffstat (limited to 'drivers/usb/host/pci-quirks.h')
| -rw-r--r-- | drivers/usb/host/pci-quirks.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/pci-quirks.h b/drivers/usb/host/pci-quirks.h index ef004a5de20f..7f69a39163ce 100644 --- a/drivers/usb/host/pci-quirks.h +++ b/drivers/usb/host/pci-quirks.h | |||
| @@ -15,6 +15,7 @@ void usb_disable_xhci_ports(struct pci_dev *xhci_pdev); | |||
| 15 | static inline void usb_amd_quirk_pll_disable(void) {} | 15 | static inline void usb_amd_quirk_pll_disable(void) {} |
| 16 | static inline void usb_amd_quirk_pll_enable(void) {} | 16 | static inline void usb_amd_quirk_pll_enable(void) {} |
| 17 | static inline void usb_amd_dev_put(void) {} | 17 | static inline void usb_amd_dev_put(void) {} |
| 18 | static inline void usb_disable_xhci_ports(struct pci_dev *xhci_pdev) {} | ||
| 18 | #endif /* CONFIG_PCI */ | 19 | #endif /* CONFIG_PCI */ |
| 19 | 20 | ||
| 20 | #endif /* __LINUX_USB_PCI_QUIRKS_H */ | 21 | #endif /* __LINUX_USB_PCI_QUIRKS_H */ |