diff options
| author | Doug Ledford <dledford@redhat.com> | 2016-12-14 14:56:21 -0500 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-12-14 14:56:21 -0500 |
| commit | 6f94ba20799b98c8badf047b184fb4cd7bc45e44 (patch) | |
| tree | 41d55a0005cd2e0b27a110f3e70b342f9426f668 /drivers/net/vmxnet3 | |
| parent | 9032ad78bb58f2567fc95125ee69cde7b74c0a21 (diff) | |
| parent | 29c8d9eba550c6d73d17cc1618a9f5f2a7345aa1 (diff) | |
| download | blackbird-obmc-linux-6f94ba20799b98c8badf047b184fb4cd7bc45e44.tar.gz blackbird-obmc-linux-6f94ba20799b98c8badf047b184fb4cd7bc45e44.zip | |
Merge branch 'vmw_pvrdma' into merge-test
Diffstat (limited to 'drivers/net/vmxnet3')
| -rw-r--r-- | drivers/net/vmxnet3/vmxnet3_int.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h index 7dc37a090549..59e077be8829 100644 --- a/drivers/net/vmxnet3/vmxnet3_int.h +++ b/drivers/net/vmxnet3/vmxnet3_int.h @@ -119,9 +119,8 @@ enum { }; /* - * PCI vendor and device IDs. + * Maximum devices supported. */ -#define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07B0 #define MAX_ETHERNET_CARDS 10 #define MAX_PCI_PASSTHRU_DEVICE 6 |
