Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 352473
b: refs/heads/master
c: c5d0b72
h: refs/heads/master
i:
  352471: 1db3fe3
v: v3
  • Loading branch information
Michael Chan authored and David S. Miller committed Feb 15, 2013
1 parent 02eed46 commit 4a56152
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d240d210f5a9254d4df395d65f1ed3b2b45bc298
refs/heads/master: c5d0b72e641340c5dc915cdfab5e2c55d81425c2
6 changes: 4 additions & 2 deletions trunk/drivers/net/ethernet/broadcom/tg3.c
Original file line number Diff line number Diff line change
Expand Up @@ -13883,7 +13883,8 @@ static void tg3_get_5720_nvram_info(struct tg3 *tp)
tp->nvram_size = TG3_NVRAM_SIZE_1MB;
break;
default:
tp->nvram_size = TG3_NVRAM_SIZE_128KB;
if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5762)
tp->nvram_size = TG3_NVRAM_SIZE_128KB;
break;
}
break;
Expand Down Expand Up @@ -13929,7 +13930,8 @@ static void tg3_get_5720_nvram_info(struct tg3 *tp)
tp->nvram_size = TG3_NVRAM_SIZE_1MB;
break;
default:
tp->nvram_size = TG3_NVRAM_SIZE_128KB;
if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5762)
tp->nvram_size = TG3_NVRAM_SIZE_128KB;
break;
}
break;
Expand Down

0 comments on commit 4a56152

Please sign in to comment.