---

yaml --- r: 204449 b: refs/heads/master c: c2e07b3 h: refs/heads/master i: 204447: 0f83f89 v: v3
git-mirror · Aug 4, 2010 · 19b723b · 19b723b
1 parent 4089886
commit 19b723b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4d01439515acd5d9a09de1d1e02ca40403dda49
+refs/heads/master: c2e07b3a9ced33dd92597201be3931be8ea57ed6
diff --git a/trunk/drivers/dma/fsldma.c b/trunk/drivers/dma/fsldma.c
@@ -10,7 +10,7 @@
  * Description:
  *   DMA engine driver for Freescale MPC8540 DMA controller, which is
  *   also fit for MPC8560, MPC8555, MPC8548, MPC8641, and etc.
- *   The support for MPC8349 DMA contorller is also added.
+ *   The support for MPC8349 DMA controller is also added.
  *
  * This driver instructs the DMA controller to issue the PCI Read Multiple
  * command for PCI read operations, instead of using the default PCI Read Line

diff --git a/trunk/drivers/net/sh_eth.c b/trunk/drivers/net/sh_eth.c
@@ -1325,7 +1325,7 @@ static int sh_mdio_init(struct net_device *ndev, int id)
 	bitbang->mdc_msk = 0x01;
 	bitbang->ctrl.ops = &bb_ops;
 
-	/* MII contorller setting */
+	/* MII controller setting */
 	mdp->mii_bus = alloc_mdio_bitbang(&bitbang->ctrl);
 	if (!mdp->mii_bus) {
 		ret = -ENOMEM;