aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 19:47:22 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 19:47:22 -0500
commit9073e1a804c3096eda84ee7cbf11d1f174236c75 (patch)
tree2f1b488b606bc03f8c5ce133f9158196fef07cd2 /drivers/net
parent4937e2a6f939a41bf811378e80d71f68aa0950c6 (diff)
parent2bb9936beac2eed0c1ed907f83694bc752e159d9 (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 earth-shaking, news-breaking, rocket science pile from trivial.git" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits) doc: usb: Fix typo in Documentation/usb/gadget_configs.txt doc: add missing files to timers/00-INDEX timekeeping: Fix some trivial typos in comments mm: Fix some trivial typos in comments irq: Fix some trivial typos in comments NUMA: fix typos in Kconfig help text mm: update 00-INDEX doc: Documentation/DMA-attributes.txt fix typo DRM: comment: `halve' -> `half' Docs: Kconfig: `devlopers' -> `developers' doc: typo on word accounting in kprobes.c in mutliple architectures treewide: fix "usefull" typo treewide: fix "distingush" typo mm/Kconfig: Grammar s/an/a/ kexec: Typo s/the/then/ Documentation/kvm: Update cpuid documentation for steal time and pv eoi treewide: Fix common typo in "identify" __page_to_pfn: Fix typo in comment Correct some typos for word frequency clk: fixed-factor: Fix a trivial typo ...
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/fw.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c2
-rw-r--r--drivers/net/irda/ali-ircc.c2
-rw-r--r--drivers/net/irda/nsc-ircc.c2
-rw-r--r--drivers/net/wireless/ath/ath10k/pci.c2
-rw-r--r--drivers/net/wireless/ath/ath5k/dma.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index fda26679f7d5..194928214606 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -1774,7 +1774,7 @@ void mlx4_opreq_action(struct work_struct *work)
1774 MLX4_CMD_GET_OP_REQ, MLX4_CMD_TIME_CLASS_A, 1774 MLX4_CMD_GET_OP_REQ, MLX4_CMD_TIME_CLASS_A,
1775 MLX4_CMD_NATIVE); 1775 MLX4_CMD_NATIVE);
1776 if (err) { 1776 if (err) {
1777 mlx4_err(dev, "Failed to retreive required operation: %d\n", 1777 mlx4_err(dev, "Failed to retrieve required operation: %d\n",
1778 err); 1778 err);
1779 return; 1779 return;
1780 } 1780 }
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index a01a6a74ee3a..b1cb0ffb15c7 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -1730,7 +1730,7 @@ static void qlcnic_extend_lb_idc_cmpltn_wait(struct qlcnic_adapter *adapter,
1730 struct qlcnic_hardware_context *ahw = adapter->ahw; 1730 struct qlcnic_hardware_context *ahw = adapter->ahw;
1731 int temp; 1731 int temp;
1732 1732
1733 netdev_info(adapter->netdev, "Recieved loopback IDC time extend event for 0x%x seconds\n", 1733 netdev_info(adapter->netdev, "Received loopback IDC time extend event for 0x%x seconds\n",
1734 ahw->extend_lb_time); 1734 ahw->extend_lb_time);
1735 temp = ahw->extend_lb_time * 1000; 1735 temp = ahw->extend_lb_time * 1000;
1736 *max_wait_count += temp / QLC_83XX_LB_MSLEEP_COUNT; 1736 *max_wait_count += temp / QLC_83XX_LB_MSLEEP_COUNT;
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index 7bbd318bc93e..befa45f809c3 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -627,7 +627,7 @@ static int ali_ircc_setup(chipio_t *info)
627/* 627/*
628 * Function ali_ircc_read_dongle_id (int index, info) 628 * Function ali_ircc_read_dongle_id (int index, info)
629 * 629 *
630 * Try to read dongle indentification. This procedure needs to be executed 630 * Try to read dongle identification. This procedure needs to be executed
631 * once after power-on/reset. It also needs to be used whenever you suspect 631 * once after power-on/reset. It also needs to be used whenever you suspect
632 * that the user may have plugged/unplugged the IrDA Dongle. 632 * that the user may have plugged/unplugged the IrDA Dongle.
633 */ 633 */
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index ceeb53737f86..66bc03bdb138 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -1035,7 +1035,7 @@ static int nsc_ircc_setup(chipio_t *info)
1035/* 1035/*
1036 * Function nsc_ircc_read_dongle_id (void) 1036 * Function nsc_ircc_read_dongle_id (void)
1037 * 1037 *
1038 * Try to read dongle indentification. This procedure needs to be executed 1038 * Try to read dongle identification. This procedure needs to be executed
1039 * once after power-on/reset. It also needs to be used whenever you suspect 1039 * once after power-on/reset. It also needs to be used whenever you suspect
1040 * that the user may have plugged/unplugged the IrDA Dongle. 1040 * that the user may have plugged/unplugged the IrDA Dongle.
1041 */ 1041 */
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index f8d59c7b9082..9e86a811086f 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -2363,7 +2363,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev,
2363 break; 2363 break;
2364 default: 2364 default:
2365 ret = -ENODEV; 2365 ret = -ENODEV;
2366 ath10k_err("Unkown device ID: %d\n", pci_dev->device); 2366 ath10k_err("Unknown device ID: %d\n", pci_dev->device);
2367 goto err_ar_pci; 2367 goto err_ar_pci;
2368 } 2368 }
2369 2369
diff --git a/drivers/net/wireless/ath/ath5k/dma.c b/drivers/net/wireless/ath/ath5k/dma.c
index ce86f158423b..ba200b24be64 100644
--- a/drivers/net/wireless/ath/ath5k/dma.c
+++ b/drivers/net/wireless/ath/ath5k/dma.c
@@ -661,7 +661,7 @@ ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)
661 ah->ah_txq_isr_txok_all |= AR5K_REG_MS(sisr1, 661 ah->ah_txq_isr_txok_all |= AR5K_REG_MS(sisr1,
662 AR5K_SISR1_QCU_TXEOL); 662 AR5K_SISR1_QCU_TXEOL);
663 663
664 /* Currently this is not much usefull since we treat 664 /* Currently this is not much useful since we treat
665 * all queues the same way if we get a TXURN (update 665 * all queues the same way if we get a TXURN (update
666 * tx trigger level) but we might need it later on*/ 666 * tx trigger level) but we might need it later on*/
667 if (pisr & AR5K_ISR_TXURN) 667 if (pisr & AR5K_ISR_TXURN)