Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94e57fea authored by Francesco Ruggeri's avatar Francesco Ruggeri Committed by Bjorn Helgaas
Browse files

PCI: Move PCI_VENDOR_ID_VMWARE to pci_ids.h 



Move PCI_VENDOR_ID_VMWARE from device-specific files to pci_ids.h.
It is useful to always have access to it, especially when accessing
subsystem_vendor_id on emulated devices.

[bhelgaas: keep pci_ids.h sorted and use lower-case hex]
Signed-off-by: default avatarFrancesco Ruggeri <fruggeri@arista.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 63ddc0b8

drivers/gpu/drm/vmwgfx/svga_reg.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
/*

 * PCI device IDs.

 */

#define PCI_VENDOR_ID_VMWARE            0x15AD

#define PCI_DEVICE_ID_VMWARE_SVGA2      0x0405



/*

drivers/misc/vmw_vmci/vmci_guest.c

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include "vmci_driver.h"

#include "vmci_event.h"



#define PCI_VENDOR_ID_VMWARE		0x15AD

#define PCI_DEVICE_ID_VMWARE_VMCI	0x0740



#define VMCI_UTIL_NUM_RESOURCES 1

drivers/net/vmxnet3/vmxnet3_int.h

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ enum { 
/*

 * PCI vendor and device IDs.

 */

#define PCI_VENDOR_ID_VMWARE            0x15AD

#define PCI_DEVICE_ID_VMWARE_VMXNET3    0x07B0

#define MAX_ETHERNET_CARDS		10

#define MAX_PCI_PASSTHRU_DEVICE		6

drivers/scsi/vmw_pvscsi.h

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 


#define MASK(n)        ((1 << (n)) - 1)        /* make an n-bit mask */



#define PCI_VENDOR_ID_VMWARE		0x15AD

#define PCI_DEVICE_ID_VMWARE_PVSCSI	0x07C0



/*

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -2245,6 +2245,8 @@ 
#define PCI_VENDOR_ID_MORETON		0x15aa

#define PCI_DEVICE_ID_RASTEL_2PORT	0x2000



#define PCI_VENDOR_ID_VMWARE		0x15ad



#define PCI_VENDOR_ID_ZOLTRIX		0x15b0

#define PCI_DEVICE_ID_ZOLTRIX_2BD0	0x2bd0