diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-12-06 12:58:28 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-12-06 12:58:28 -0800 |
| commit | 9ed5dacbfa0f3f74238854776385f150b68e78b9 (patch) | |
| tree | 8c3ed48bd6e89fb2ee199ab6b2287ca2e17f165c /include/hw | |
| parent | cdac7a7184065467ba45ec83a9abfeeae060ce4b (diff) | |
| parent | 539891a85d17bd8c23a2547e52e26993350d2c3a (diff) | |
Merge remote-tracking branch 'sstabellini/xen-2013-12-01' into staging
# By Paul Durrant (1) and Wei Liu (1)
# Via Stefano Stabellini
* sstabellini/xen-2013-12-01:
xen-pvdevice: make device-id property compulsory
xen: fix two errors when debug is enabled
Message-id: alpine.DEB.2.02.1312011829000.3198@kaball.uk.xensource.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/pci/pci_ids.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h index 4c0002bec..e597070ab 100644 --- a/include/hw/pci/pci_ids.h +++ b/include/hw/pci/pci_ids.h @@ -146,7 +146,6 @@ #define PCI_VENDOR_ID_XEN 0x5853 #define PCI_DEVICE_ID_XEN_PLATFORM 0x0001 -#define PCI_DEVICE_ID_XEN_PVDEVICE 0x0002 #define PCI_VENDOR_ID_NEC 0x1033 #define PCI_DEVICE_ID_NEC_UPD720200 0x0194 |