1. Remove USB HC Protocol installing from Uhci module. It only installs USB2 HC protocol.

2. Restore Incompatible Pci Device Support Protocol in PciBus module.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4617 6f19259b-4bc3-4df7-8a09-765794883524

IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.c

@@ -27,6 +27,7 @@ EFI_DRIVER_BINDING_PROTOCOL                   gPciBusDriverBinding = {
   NULL
 };
 
+EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL  *gEfiIncompatiblePciDeviceSupport = NULL;
 EFI_HANDLE                                    gPciHostBrigeHandles[PCI_MAX_HOST_BRIDGE_NUM];
 UINTN                                         gPciHostBridgeNumber;
 BOOLEAN                                       gFullEnumeration;
@@ -215,6 +216,12 @@ Returns:
 {
   EFI_STATUS  Status;
 
+  Status = gBS->LocateProtocol (
+                  &gEfiIncompatiblePciDeviceSupportProtocolGuid,
+                  NULL,
+                  (VOID **) &gEfiIncompatiblePciDeviceSupport
+                  );
+
   //
   // If PCI Platform protocol is available, get it now.
   // If the platform implements this, it must be installed before BDS phase