From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 19 Jul 2011 13:03:20 +0000 (-0500)
Subject: Merge remote-tracking branch 'kraxel/usb.19' into staging
X-Git-Tag: v0.15.0-rc0~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4dabf9587d8e1d5d5edc6d3326021e390b9a532;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'kraxel/usb.19' into staging
---

b4dabf9587d8e1d5d5edc6d3326021e390b9a532
diff --cc hw/pci_ids.h
index b49c6028449,927f2b06277..83f38934ec9
--- a/hw/pci_ids.h
+++ b/hw/pci_ids.h
@@@ -109,6 -109,13 +109,14 @@@
  #define PCI_DEVICE_ID_INTEL_82371AB      0x7111
  #define PCI_DEVICE_ID_INTEL_82371AB_2    0x7112
  #define PCI_DEVICE_ID_INTEL_82371AB_3    0x7113
+ #define PCI_DEVICE_ID_INTEL_82801I_UHCI1 0x2934
+ #define PCI_DEVICE_ID_INTEL_82801I_UHCI2 0x2935
+ #define PCI_DEVICE_ID_INTEL_82801I_UHCI3 0x2936
+ #define PCI_DEVICE_ID_INTEL_82801I_UHCI4 0x2937
+ #define PCI_DEVICE_ID_INTEL_82801I_UHCI5 0x2938
+ #define PCI_DEVICE_ID_INTEL_82801I_UHCI6 0x2939
+ #define PCI_DEVICE_ID_INTEL_82801I_EHCI1 0x293a
+ #define PCI_DEVICE_ID_INTEL_82801I_EHCI2 0x293c
  
 -#define PCI_VENDOR_ID_XENSOURCE          0x5853
 +#define PCI_VENDOR_ID_XEN               0x5853
 +#define PCI_DEVICE_ID_XEN_PLATFORM      0x0001