diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /drivers/net/ibm_newemac/phy.c | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'drivers/net/ibm_newemac/phy.c')
| -rw-r--r-- | drivers/net/ibm_newemac/phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ibm_newemac/phy.c index 606db53ef78e..c40cd8df2212 100644 --- a/drivers/net/ibm_newemac/phy.c +++ b/drivers/net/ibm_newemac/phy.c | |||
| @@ -362,7 +362,7 @@ static struct mii_phy_def bcm5248_phy_def = { | |||
| 362 | 362 | ||
| 363 | static int m88e1111_init(struct mii_phy *phy) | 363 | static int m88e1111_init(struct mii_phy *phy) |
| 364 | { | 364 | { |
| 365 | pr_debug("%s: Marvell 88E1111 Ethernet\n", __FUNCTION__); | 365 | pr_debug("%s: Marvell 88E1111 Ethernet\n", __func__); |
| 366 | phy_write(phy, 0x14, 0x0ce3); | 366 | phy_write(phy, 0x14, 0x0ce3); |
| 367 | phy_write(phy, 0x18, 0x4101); | 367 | phy_write(phy, 0x18, 0x4101); |
| 368 | phy_write(phy, 0x09, 0x0e00); | 368 | phy_write(phy, 0x09, 0x0e00); |