diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /drivers/net/niu.h | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'drivers/net/niu.h')
| -rw-r--r-- | drivers/net/niu.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/niu.h b/drivers/net/niu.h index 101a3f1a8ec..c6fa883daa2 100644 --- a/drivers/net/niu.h +++ b/drivers/net/niu.h | |||
| @@ -2946,6 +2946,15 @@ struct rx_ring_info { | |||
| 2946 | #define NIU_ALONSO_BM_STR "373-0202" | 2946 | #define NIU_ALONSO_BM_STR "373-0202" |
| 2947 | #define NIU_FOXXY_BM_STR "501-7961" | 2947 | #define NIU_FOXXY_BM_STR "501-7961" |
| 2948 | #define NIU_2XGF_MRVL_BM_STR "SK-6E82" | 2948 | #define NIU_2XGF_MRVL_BM_STR "SK-6E82" |
| 2949 | #define NIU_QGC_LP_MDL_STR "SUNW,pcie-qgc" | ||
| 2950 | #define NIU_2XGF_LP_MDL_STR "SUNW,pcie-2xgf" | ||
| 2951 | #define NIU_QGC_PEM_MDL_STR "SUNW,pcie-qgc-pem" | ||
| 2952 | #define NIU_2XGF_PEM_MDL_STR "SUNW,pcie-2xgf-pem" | ||
| 2953 | #define NIU_ALONSO_MDL_STR "SUNW,CP3220" | ||
| 2954 | #define NIU_KIMI_MDL_STR "SUNW,CP3260" | ||
| 2955 | #define NIU_MARAMBA_MDL_STR "SUNW,pcie-neptune" | ||
| 2956 | #define NIU_FOXXY_MDL_STR "SUNW,pcie-rfem" | ||
| 2957 | #define NIU_2XGF_MRVL_MDL_STR "SysKonnect,pcie-2xgf" | ||
| 2949 | 2958 | ||
| 2950 | #define NIU_VPD_MIN_MAJOR 3 | 2959 | #define NIU_VPD_MIN_MAJOR 3 |
| 2951 | #define NIU_VPD_MIN_MINOR 4 | 2960 | #define NIU_VPD_MIN_MINOR 4 |