From 5445831c3b5e8e00c8abf129b6ce53379d7a9e7e Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Thu, 8 Jul 2010 13:36:32 +0000
Subject: [PATCH] --- yaml --- r: 203426 b: refs/heads/master c:
 47562e5d325af9ce5306bce53eb7cdd353fe46be h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/sfc/net_driver.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f41051f4a7a8..73fad77f4f26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fe876af921d1d2bc8353e0062c10ff35e902653
+refs/heads/master: 47562e5d325af9ce5306bce53eb7cdd353fe46be
diff --git a/trunk/drivers/net/sfc/net_driver.h b/trunk/drivers/net/sfc/net_driver.h
index bab836c22719..64e7caa4bbb5 100644
--- a/trunk/drivers/net/sfc/net_driver.h
+++ b/trunk/drivers/net/sfc/net_driver.h
@@ -622,7 +622,6 @@ union efx_multicast_hash {
  * struct efx_nic - an Efx NIC
  * @name: Device name (net device name or bus id before net device registered)
  * @pci_dev: The PCI device
- * @port_num: Index of this host port within the controller
  * @type: Controller type attributes
  * @legacy_irq: IRQ number
  * @workqueue: Workqueue for port reconfigures and the HW monitor.
@@ -708,7 +707,6 @@ union efx_multicast_hash {
 struct efx_nic {
 	char name[IFNAMSIZ];
 	struct pci_dev *pci_dev;
-	unsigned port_num;
 	const struct efx_nic_type *type;
 	int legacy_irq;
 	struct workqueue_struct *workqueue;