diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:54 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:54 +0200 |
commit | 0ed368c71aa65cba8d349432bd4dab4a9a2eb39c (patch) | |
tree | 7746534bafd57f6764bda8f26efc3929a4acf914 /drivers/net/atlx/atl1.c | |
parent | 7aaaec38fcd9ef3172e69f8c19f20113830a8498 (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge branch 'linus' into x86/kconfig
Diffstat (limited to 'drivers/net/atlx/atl1.c')
-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 99e0b4cdc56..3c798ae5c34 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 ? */ |