git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
intel
/
fm10k
/
fm10k_type.h
diff --git
a/drivers/net/ethernet/intel/fm10k/fm10k_type.h
b/drivers/net/ethernet/intel/fm10k/fm10k_type.h
index 3e608e493f9df6bf921383f65be2139ad38cb288..9fb9fca375e3f69282c757fb3ae665a18982e8f3 100644
(file)
--- a/
drivers/net/ethernet/intel/fm10k/fm10k_type.h
+++ b/
drivers/net/ethernet/intel/fm10k/fm10k_type.h
@@
-15,6
+15,8
@@
struct fm10k_hw;
#define FM10K_DEV_ID_PF 0x15A4
#define FM10K_DEV_ID_VF 0x15A5
+#define FM10K_DEV_ID_SDI_FM10420_QDA2 0x15D0
+#define FM10K_DEV_ID_SDI_FM10420_DA2 0x15D5
#define FM10K_MAX_QUEUES 256
#define FM10K_MAX_QUEUES_PF 128