From: Jeff Garzik <jgarzik@pretzel.yyz.us>
Date: Sun, 26 Jun 2005 21:11:03 +0000 (-0400)
Subject: Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
X-Git-Tag: v2.6.13-rc1~90
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8b0ee07e108b2eefdab5bb73f33223f18926c3b2;p=linux-2.6-omap-h63xx.git

Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.
---

8b0ee07e108b2eefdab5bb73f33223f18926c3b2
diff --cc drivers/net/ixgb/ixgb_main.c
index a6af9d9e340,35f6a7c271a..097b90ccf57
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@@ -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