From eedce2cee36eb320c54aabff5364afcad1517681 Mon Sep 17 00:00:00 2001 From: Tomoya MORINAGA Date: Fri, 11 Nov 2011 10:12:18 +0900 Subject: [PATCH] --- yaml --- r: 275767 b: refs/heads/master c: 2a9887919457c6e1bd482e8448223be59d19010a h: refs/heads/master i: 275765: 37ca494e80a78fc00891f79e64281b79bd973604 275763: a1d048f092eefdfc1a5eabac528ffc59b114bab3 275759: 53751d848a9fd62cd088ac1afb4e00e8f43ae8ee v: v3 --- [refs] | 2 +- trunk/drivers/misc/pch_phub.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4834c2400de2..0d45a21613c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9914a0de7a27ef2cb5d9aacfe50ae97ebb532f28 +refs/heads/master: 2a9887919457c6e1bd482e8448223be59d19010a diff --git a/trunk/drivers/misc/pch_phub.c b/trunk/drivers/misc/pch_phub.c index 0e2c1819a944..10fc4785dba7 100644 --- a/trunk/drivers/misc/pch_phub.c +++ b/trunk/drivers/misc/pch_phub.c @@ -476,7 +476,7 @@ static int pch_phub_write_gbe_mac_addr(struct pch_phub_reg *chip, u8 *data) int retval; int i; - if (chip->ioh_type == 1) /* EG20T */ + if ((chip->ioh_type == 1) || (chip->ioh_type == 5)) /* EG20T or ML7831*/ retval = pch_phub_gbe_serial_rom_conf(chip); else /* ML7223 */ retval = pch_phub_gbe_serial_rom_conf_mp(chip);