diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 19:09:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 19:09:35 -0700 |
| commit | 89c9fea3c8034cdb2fd745f551cde0b507fd6893 (patch) | |
| tree | c20880998ad9a212c83818eb3b62eaacab45a1fa /drivers/net | |
| parent | 76f1948a79b26d5f57a5ee9941876b745c6baaea (diff) | |
| parent | 6fbc8798d9461c0ff22fab9fbaddde13de815941 (diff) | |
| download | linux-89c9fea3c8034cdb2fd745f551cde0b507fd6893.tar.gz linux-89c9fea3c8034cdb2fd745f551cde0b507fd6893.tar.bz2 linux-89c9fea3c8034cdb2fd745f551cde0b507fd6893.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
tty: fix comment for __tty_alloc_driver()
init/main: properly align the multi-line comment
init/main: Fix double "the" in comment
Fix dead URLs to ftp.kernel.org
drivers: Clean up duplicated email address
treewide: Fix typo in xml/driver-api/basics.xml
tools/testing/selftests/powerpc: remove redundant CFLAGS in Makefile: "-Wall -O2 -Wall" -> "-O2 -Wall"
selftests/timers: Spelling s/privledges/privileges/
HID: picoLCD: Spelling s/REPORT_WRTIE_MEMORY/REPORT_WRITE_MEMORY/
net: phy: dp83848: Fix Typo
UBI: Fix typos
Documentation: ftrace.txt: Correct nice value of 120 priority
net: fec: Fix typo in error msg and comment
treewide: Fix typos in printk
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 4 | ||||
| -rw-r--r-- | drivers/net/phy/dp83848.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index a92bf94f8e94..56a563f90b0b 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -2002,7 +2002,7 @@ static int fec_enet_mii_init(struct platform_device *pdev) mii_speed--; if (mii_speed > 63) { dev_err(&pdev->dev, - "fec clock (%lu) to fast to get right mii speed\n", + "fec clock (%lu) too fast to get right mii speed\n", clk_get_rate(fep->clk_ipg)); err = -EINVAL; goto err_out; @@ -2948,7 +2948,7 @@ static void set_multicast_list(struct net_device *ndev) } /* only upper 6 bits (FEC_HASH_BITS) are used - * which point to specific bit in he hash registers + * which point to specific bit in the hash registers */ hash = (crc >> (32 - FEC_HASH_BITS)) & 0x3f; diff --git a/drivers/net/phy/dp83848.c b/drivers/net/phy/dp83848.c index a10d0e7fc5f7..3de4fe4dda77 100644 --- a/drivers/net/phy/dp83848.c +++ b/drivers/net/phy/dp83848.c @@ -115,5 +115,5 @@ static struct phy_driver dp83848_driver[] = { module_phy_driver(dp83848_driver); MODULE_DESCRIPTION("Texas Instruments DP83848 PHY driver"); -MODULE_AUTHOR("Andrew F. Davis <afd@ti.com"); +MODULE_AUTHOR("Andrew F. Davis <afd@ti.com>"); MODULE_LICENSE("GPL"); diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c index 3571ce4bd276..2bc6bace069c 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c @@ -2111,7 +2111,7 @@ static enum version_8821ae _rtl8821ae_read_chip_version(struct ieee80211_hw *hw) break; default: RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, - "Chip Version ID: Unknow (0x%X)\n", version); + "Chip Version ID: Unknown (0x%X)\n", version); break; } |