Merge "usb: XHCI: Do not allow enabling MSI from XHCI"

drivers/usb/host/xhci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -189,7 +189,7 @@ int xhci_reset(struct xhci_hcd *xhci)
		return ret;
		}

		#ifdef CONFIG_PCI
		#if defined(CONFIG_PCI) && !defined(CONFIG_ARCH_MSM)
		static int xhci_free_msi(struct xhci_hcd *xhci)
		{
		int i;