summaryrefslogtreecommitdiffstats
path: root/drivers/staging/winbond
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-04-13 12:14:05 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-13 12:14:05 -0700
commit32235b07b52e948900613e27c5cbd955d084ae8a (patch)
tree92b887a4b3b925df4c8e729e72b0f2daac185dbf /drivers/staging/winbond
parent59c23eabdae97a18cfc400339138f6d1dbde926a (diff)
parenta6360dd37e1a144ed11e6548371bade559a1e4df (diff)
downloadlinux-32235b07b52e948900613e27c5cbd955d084ae8a.tar.gz
linux-32235b07b52e948900613e27c5cbd955d084ae8a.tar.bz2
linux-32235b07b52e948900613e27c5cbd955d084ae8a.zip
Staging: merge 2.6.39-rc3 into staging-next
This was done to handle a number of conflicts, the majority of which were caused by the big "fix spelling issues" patch. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/winbond')
-rw-r--r--drivers/staging/winbond/mds.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/winbond/mds.c b/drivers/staging/winbond/mds.c
index 9cfea94bcea5..c9f0e8f856a0 100644
--- a/drivers/staging/winbond/mds.c
+++ b/drivers/staging/winbond/mds.c
@@ -492,7 +492,7 @@ Mds_Tx(struct wbsoft_priv *adapter)
TxDesIndex = pMds->TxDesIndex; /* Get the current ID */
pTxDes->Descriptor_ID = TxDesIndex;
- pMds->TxDesFrom[TxDesIndex] = 2; /* Storing the information of source comming from */
+ pMds->TxDesFrom[TxDesIndex] = 2; /* Storing the information of source coming from */
pMds->TxDesIndex++;
pMds->TxDesIndex %= MAX_USB_TX_DESCRIPTOR;