aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2010-08-03 13:44:52 -0400
committerJiri Kosina <jkosina@suse.cz>2010-08-04 09:05:43 -0400
commitc2e07b3a9ced33dd92597201be3931be8ea57ed6 (patch)
tree636de2e08a4ebbe7136d9ae16625f0297562ece9
parentf4d01439515acd5d9a09de1d1e02ca40403dda49 (diff)
Fix spelling contorller -> controller in comments
Cc: Jiri Kosina <trivial@kernel.org> Cc: linux-kernel@vger.kernel.org Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/dma/fsldma.c2
-rw-r--r--drivers/net/sh_eth.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 8088b14ba5f7..f0fd6db6063c 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -10,7 +10,7 @@
10 * Description: 10 * Description:
11 * DMA engine driver for Freescale MPC8540 DMA controller, which is 11 * DMA engine driver for Freescale MPC8540 DMA controller, which is
12 * also fit for MPC8560, MPC8555, MPC8548, MPC8641, and etc. 12 * also fit for MPC8560, MPC8555, MPC8548, MPC8641, and etc.
13 * The support for MPC8349 DMA contorller is also added. 13 * The support for MPC8349 DMA controller is also added.
14 * 14 *
15 * This driver instructs the DMA controller to issue the PCI Read Multiple 15 * This driver instructs the DMA controller to issue the PCI Read Multiple
16 * command for PCI read operations, instead of using the default PCI Read Line 16 * command for PCI read operations, instead of using the default PCI Read Line
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 501a55ffce57..70a9bc5be1a1 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -1325,7 +1325,7 @@ static int sh_mdio_init(struct net_device *ndev, int id)
1325 bitbang->mdc_msk = 0x01; 1325 bitbang->mdc_msk = 0x01;
1326 bitbang->ctrl.ops = &bb_ops; 1326 bitbang->ctrl.ops = &bb_ops;
1327 1327
1328 /* MII contorller setting */ 1328 /* MII controller setting */
1329 mdp->mii_bus = alloc_mdio_bitbang(&bitbang->ctrl); 1329 mdp->mii_bus = alloc_mdio_bitbang(&bitbang->ctrl);
1330 if (!mdp->mii_bus) { 1330 if (!mdp->mii_bus) {
1331 ret = -ENOMEM; 1331 ret = -ENOMEM;