]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
authorJeff Garzik <jgarzik@pretzel.yyz.us>
Sun, 26 Jun 2005 21:11:03 +0000 (17:11 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 26 Jun 2005 21:11:03 +0000 (17:11 -0400)
1  2 
drivers/net/8139cp.c
drivers/net/ixgb/ixgb_main.c

Simple merge
index a6af9d9e340865278cfe4b607efed9e56c087538,35f6a7c271a2be3a1f749716cbe27b1bffc66b98..097b90ccf575b2d17e8f6f67458bcd6003dba96c
@@@ -47,8 -47,7 +47,9 @@@ char ixgb_driver_string[] = "Intel(R) P
  #else
  #define DRIVERNAPI "-NAPI"
  #endif
- #define DRV_VERSION "1.0.90-k2"DRIVERNAPI
 -char ixgb_driver_version[] = "1.0.95-k2"DRIVERNAPI;
++
++#define DRV_VERSION "1.0.95-k2"DRIVERNAPI
 +char ixgb_driver_version[] = DRV_VERSION;
  char ixgb_copyright[] = "Copyright (c) 1999-2005 Intel Corporation.";
  
  /* ixgb_pci_tbl - PCI Device ID Table