diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-16 11:46:03 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-16 11:46:03 -0500 |
| commit | d59abb9325ae5eb8fd28440d80f820b945887541 (patch) | |
| tree | 6ba86796569a8b478a959c2c76c8bfb2bde34522 /drivers/usb/host/xhci-pci.c | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
| parent | 3d724fa513cd1bd06d3457ccda36941f3606d048 (diff) | |
Merge branch 3.13-rc4 into usb-next
Diffstat (limited to 'drivers/usb/host/xhci-pci.c')
| -rw-r--r-- | drivers/usb/host/xhci-pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index b8dffd59eb25..4221dee924b5 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c | |||
| @@ -331,6 +331,7 @@ static const struct hc_driver xhci_pci_hc_driver = { | |||
| 331 | .check_bandwidth = xhci_check_bandwidth, | 331 | .check_bandwidth = xhci_check_bandwidth, |
| 332 | .reset_bandwidth = xhci_reset_bandwidth, | 332 | .reset_bandwidth = xhci_reset_bandwidth, |
| 333 | .address_device = xhci_address_device, | 333 | .address_device = xhci_address_device, |
| 334 | .enable_device = xhci_enable_device, | ||
| 334 | .update_hub_device = xhci_update_hub_device, | 335 | .update_hub_device = xhci_update_hub_device, |
| 335 | .reset_device = xhci_discover_or_reset_device, | 336 | .reset_device = xhci_discover_or_reset_device, |
| 336 | 337 | ||