From cf151d971513a3f93066d4c06610182990123d07 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 4 Feb 2013 18:22:29 +0000
Subject: [PATCH] --- yaml --- r: 352101 b: refs/heads/master c:
 efc496eb317ce46755acc46172daa0992b184ed0 h: refs/heads/master i:   352099:
 047680496e345178e94b102b7989c18d8a1dd44b v: v3

---
 [refs]                                                     | 2 +-
 trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c | 1 -
 trunk/drivers/net/wimax/i2400m/rx.c                        | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index db92f1891540..2ad728e36515 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62b5942aa5182686e6bab2c6db5dbf2672b8981e
+refs/heads/master: efc496eb317ce46755acc46172daa0992b184ed0
diff --git a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
index db50598006ef..4782dcfde736 100644
--- a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+++ b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
@@ -201,7 +201,6 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
 
 	struct netxen_cmd_buffer *cmd_buf_arr;
 	struct net_device *netdev = adapter->netdev;
-	struct pci_dev *pdev = adapter->pdev;
 
 	tx_ring = kzalloc(sizeof(struct nx_host_tx_ring), GFP_KERNEL);
 	if (tx_ring == NULL)
diff --git a/trunk/drivers/net/wimax/i2400m/rx.c b/trunk/drivers/net/wimax/i2400m/rx.c
index 8077e6e35939..0b602951ff6b 100644
--- a/trunk/drivers/net/wimax/i2400m/rx.c
+++ b/trunk/drivers/net/wimax/i2400m/rx.c
@@ -1346,7 +1346,6 @@ EXPORT_SYMBOL(i2400m_unknown_barker);
 int i2400m_rx_setup(struct i2400m *i2400m)
 {
 	int result = 0;
-	struct device *dev = i2400m_dev(i2400m);
 
 	i2400m->rx_reorder = i2400m_rx_reorder_disabled? 0 : 1;
 	if (i2400m->rx_reorder) {