diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 23:13:42 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 23:13:42 +1000 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /drivers/net/niu.h | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linux-2.6' into powerpc-next
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 97ffbe137bc..12fd570b942 100644 --- a/drivers/net/niu.h +++ b/drivers/net/niu.h @@ -2946,6 +2946,15 @@ struct rx_ring_info { #define NIU_ALONSO_BM_STR "373-0202" #define NIU_FOXXY_BM_STR "501-7961" #define NIU_2XGF_MRVL_BM_STR "SK-6E82" +#define NIU_QGC_LP_MDL_STR "SUNW,pcie-qgc" +#define NIU_2XGF_LP_MDL_STR "SUNW,pcie-2xgf" +#define NIU_QGC_PEM_MDL_STR "SUNW,pcie-qgc-pem" +#define NIU_2XGF_PEM_MDL_STR "SUNW,pcie-2xgf-pem" +#define NIU_ALONSO_MDL_STR "SUNW,CP3220" +#define NIU_KIMI_MDL_STR "SUNW,CP3260" +#define NIU_MARAMBA_MDL_STR "SUNW,pcie-neptune" +#define NIU_FOXXY_MDL_STR "SUNW,pcie-rfem" +#define NIU_2XGF_MRVL_MDL_STR "SysKonnect,pcie-2xgf" #define NIU_VPD_MIN_MAJOR 3 #define NIU_VPD_MIN_MINOR 4 |