Merge branch 'akpm' (fixes from Andrew Morton)

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / vmw_pvscsi.h

diff --git a/drivers/scsi/vmw_pvscsi.h b/drivers/scsi/vmw_pvscsi.h
index ce458885127457ac88653ae47ba9553bfd9ea6c8..ee16f0c5c47d06acb040561859e4fe62e1ed0111 100644 (file)
--- a/drivers/scsi/vmw_pvscsi.h
+++ b/drivers/scsi/vmw_pvscsi.h
@@ -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
 
 /*