diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 12:36:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 12:36:50 -0400 |
commit | 5d434fcb255dec99189f1c58a06e4f56e12bf77d (patch) | |
tree | 734289dc85074903d9e636a935d43414746e222c /drivers/net/ethernet/atheros | |
parent | 5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e (diff) | |
parent | 071361d3473ebb8142907470ff12d59c59f6be72 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual stuff, mostly comment fixes, typo fixes, printk fixes and small
code cleanups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits)
mm: Convert print_symbol to %pSR
gfs2: Convert print_symbol to %pSR
m32r: Convert print_symbol to %pSR
iostats.txt: add easy-to-find description for field 6
x86 cmpxchg.h: fix wrong comment
treewide: Fix typo in printk and comments
doc: devicetree: Fix various typos
docbook: fix 8250 naming in device-drivers
pata_pdc2027x: Fix compiler warning
treewide: Fix typo in printks
mei: Fix comments in drivers/misc/mei
treewide: Fix typos in kernel messages
pm44xx: Fix comment for "CONFIG_CPU_IDLE"
doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP"
mmzone: correct "pags" to "pages" in comment.
kernel-parameters: remove outdated 'noresidual' parameter
Remove spurious _H suffixes from ifdef comments
sound: Remove stray pluses from Kconfig file
radio-shark: Fix printk "CONFIG_LED_CLASS"
doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE
...
Diffstat (limited to 'drivers/net/ethernet/atheros')
-rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c index 21e261ffbe10..3ef7092e3f1c 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | |||
@@ -810,7 +810,7 @@ int atl1c_power_saving(struct atl1c_hw *hw, u32 wufc) | |||
810 | if (wufc & AT_WUFC_LNKC) { | 810 | if (wufc & AT_WUFC_LNKC) { |
811 | wol_ctrl |= WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN; | 811 | wol_ctrl |= WOL_LINK_CHG_EN | WOL_LINK_CHG_PME_EN; |
812 | if (atl1c_write_phy_reg(hw, MII_IER, IER_LINK_UP) != 0) { | 812 | if (atl1c_write_phy_reg(hw, MII_IER, IER_LINK_UP) != 0) { |
813 | dev_dbg(&pdev->dev, "%s: write phy MII_IER faild.\n", | 813 | dev_dbg(&pdev->dev, "%s: write phy MII_IER failed.\n", |
814 | atl1c_driver_name); | 814 | atl1c_driver_name); |
815 | } | 815 | } |
816 | } | 816 | } |