summaryrefslogtreecommitdiffstats
path: root/drivers/net/atlx
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-06-19 16:00:04 -0700
committerDavid S. Miller <davem@davemloft.net>2008-06-19 16:00:04 -0700
commit0344f1c66b544609e867bd24aa7bfa789dfa9830 (patch)
tree7f76abc095a90f7ad475417495d3d4f577080ae1 /drivers/net/atlx
parentdad9b335c6940de2746a9788eb456d09cf102f81 (diff)
parentef3a62d272f033989e83eb1f26505f93f93e3e69 (diff)
downloadop-kernel-dev-0344f1c66b544609e867bd24aa7bfa789dfa9830.zip
op-kernel-dev-0344f1c66b544609e867bd24aa7bfa789dfa9830.tar.gz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/mac80211/tx.c
Diffstat (limited to 'drivers/net/atlx')
-rw-r--r--drivers/net/atlx/atl1.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 919ffb9..3e22e78 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -471,7 +471,6 @@ static int atl1_get_permanent_address(struct atl1_hw *hw)
memcpy(hw->perm_mac_addr, eth_addr, ETH_ALEN);
return 0;
}
- return 1;
}
/* see if SPI FLAGS exist ? */
OpenPOWER on IntegriCloud