diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 11:22:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 11:22:54 +0000 |
| commit | a1926d1745114789687ac029ae8c58944b7d2256 (patch) | |
| tree | c303e75615e378451a80b97bfd2c1ba54029d9bb /drivers/net/ixgbevf/defines.h | |
| parent | 492e917635a0fa05439bb562fd51577efc9cef30 (diff) | |
| parent | 52fc43f7c1c416b114e88ff39635c36e67ef15b6 (diff) | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'drivers/net/ixgbevf/defines.h')
| -rw-r--r-- | drivers/net/ixgbevf/defines.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ixgbevf/defines.h b/drivers/net/ixgbevf/defines.h index ca2c81f49a0..de643eb2ada 100644 --- a/drivers/net/ixgbevf/defines.h +++ b/drivers/net/ixgbevf/defines.h @@ -1,7 +1,7 @@ /******************************************************************************* Intel 82599 Virtual Function driver - Copyright(c) 1999 - 2009 Intel Corporation. + Copyright(c) 1999 - 2010 Intel Corporation. This program is free software; you can redistribute it and/or modify it under the terms and conditions of the GNU General Public License, @@ -30,6 +30,7 @@ /* Device IDs */ #define IXGBE_DEV_ID_82599_VF 0x10ED +#define IXGBE_DEV_ID_X540_VF 0x1515 #define IXGBE_VF_IRQ_CLEAR_MASK 7 #define IXGBE_VF_MAX_TX_QUEUES 1 |