lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

Browse Source 
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
  Fix common misspellings
This commit is contained in:
Linus Torvalds
2011-04-07 11:14:49 -07:00
parent 2b9accbee5 25985edced
commit 42933bac11
2463 changed files with 4249 additions and 4249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/phy/phy_device.c
View File

@@ -538,7 +538,7 @@ EXPORT_SYMBOL(phy_detach);
/* Generic PHY support and helper functions */
/**
* genphy_config_advert - sanitize and advertise auto-negotation parameters
* genphy_config_advert - sanitize and advertise auto-negotiation parameters
* @phydev: target phy_device struct
*
* Description: Writes MII_ADVERTISE with the appropriate values,
@@ -687,7 +687,7 @@ int genphy_config_aneg(struct phy_device *phydev)
return result;
if (result == 0) {
/* Advertisment hasn't changed, but maybe aneg was never on to
/* Advertisement hasn't changed, but maybe aneg was never on to
* begin with? Or maybe phy was isolated? */
int ctl = phy_read(phydev, MII_BMCR);