diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-12-16 14:10:39 -0500 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-12-16 14:10:39 -0500 |
| commit | 7e95e365d5399647a41e10059e4b09826b82d78b (patch) | |
| tree | 305c9968798adae3d9484657339fa39d2a5fdaac /drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | |
| parent | 3ca9d1fc9aa64077645a26c396de9399b49ea226 (diff) | |
| parent | 5bd5e9a6ae5137a61d0b5c277eac61892d89fc4f (diff) | |
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts:
drivers/net/wireless/ath/ath6kl/init.c
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 5e92cc2079bd..4c8e19951d57 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | |||
| @@ -54,7 +54,7 @@ char ixgbevf_driver_name[] = "ixgbevf"; | |||
| 54 | static const char ixgbevf_driver_string[] = | 54 | static const char ixgbevf_driver_string[] = |
| 55 | "Intel(R) 10 Gigabit PCI Express Virtual Function Network Driver"; | 55 | "Intel(R) 10 Gigabit PCI Express Virtual Function Network Driver"; |
| 56 | 56 | ||
| 57 | #define DRV_VERSION "2.1.0-k" | 57 | #define DRV_VERSION "2.2.0-k" |
| 58 | const char ixgbevf_driver_version[] = DRV_VERSION; | 58 | const char ixgbevf_driver_version[] = DRV_VERSION; |
| 59 | static char ixgbevf_copyright[] = | 59 | static char ixgbevf_copyright[] = |
| 60 | "Copyright (c) 2009 - 2010 Intel Corporation."; | 60 | "Copyright (c) 2009 - 2010 Intel Corporation."; |