diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-19 19:00:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-19 19:00:04 -0400 |
| commit | 0344f1c66b544609e867bd24aa7bfa789dfa9830 (patch) | |
| tree | 7f76abc095a90f7ad475417495d3d4f577080ae1 /drivers/net/atlx | |
| parent | dad9b335c6940de2746a9788eb456d09cf102f81 (diff) | |
| parent | ef3a62d272f033989e83eb1f26505f93f93e3e69 (diff) | |
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.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 919ffb9bfa4e..3e22e7817bc3 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) | |||
| 471 | memcpy(hw->perm_mac_addr, eth_addr, ETH_ALEN); | 471 | memcpy(hw->perm_mac_addr, eth_addr, ETH_ALEN); |
| 472 | return 0; | 472 | return 0; |
| 473 | } | 473 | } |
| 474 | return 1; | ||
| 475 | } | 474 | } |
| 476 | 475 | ||
| 477 | /* see if SPI FLAGS exist ? */ | 476 | /* see if SPI FLAGS exist ? */ |