diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-12 23:41:02 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-12 23:41:02 +0100 |
commit | 1561747ddf9d28185548687b11aae7074d6129c4 (patch) | |
tree | 7d0561b6fd8e5f6e6f30e49142213bfb348be5ac /drivers/net/ixgbevf/ixgbevf_main.c | |
parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
parent | ixgbe: DCB, PFC not cleared until reset occurs (diff) | |
download | linux-1561747ddf9d28185548687b11aae7074d6129c4.tar.xz linux-1561747ddf9d28185548687b11aae7074d6129c4.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/ixgbevf/ixgbevf_main.c')
-rw-r--r-- | drivers/net/ixgbevf/ixgbevf_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c index c1fb2c1b540e..054ab05b7c6a 100644 --- a/drivers/net/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ixgbevf/ixgbevf_main.c @@ -49,9 +49,9 @@ char ixgbevf_driver_name[] = "ixgbevf"; static const char ixgbevf_driver_string[] = - "Intel(R) 82599 Virtual Function"; + "Intel(R) 10 Gigabit PCI Express Virtual Function Network Driver"; -#define DRV_VERSION "1.1.0-k0" +#define DRV_VERSION "2.0.0-k2" const char ixgbevf_driver_version[] = DRV_VERSION; static char ixgbevf_copyright[] = "Copyright (c) 2009 - 2010 Intel Corporation."; |