git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.39-rc3' into for-2.6.39
[pandora-kernel.git]
/
arch
/
arm
/
mach-bcmring
/
csp
/
dmac
/
dmacHw_extra.c
diff --git
a/arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c
b/arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c
index
77f84b4
..
a1f3283
100644
(file)
--- a/
arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c
+++ b/
arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c
@@
-551,7
+551,7
@@
int dmacHw_calculateDescriptorCount(dmacHw_CONFIG_t *pConfig, /* [ IN ] Config
/****************************************************************************/
/**
/****************************************************************************/
/**
-* @brief Check the exist
a
nce of pending descriptor
+* @brief Check the exist
e
nce of pending descriptor
*
* This function confirmes if there is any pending descriptor in the chain
* to program the channel
*
* This function confirmes if there is any pending descriptor in the chain
* to program the channel
@@
-775,7
+775,7
@@
int dmacHw_setVariableDataDescriptor(dmacHw_HANDLE_t handle, /* [ IN ] DMA Cha
/**
* @brief Read data DMAed to memory
*
/**
* @brief Read data DMAed to memory
*
-* This function will read data that has been DMAed to memory while transfering from:
+* This function will read data that has been DMAed to memory while transfer
r
ing from:
* - Memory to memory
* - Peripheral to memory
*
* - Memory to memory
* - Peripheral to memory
*
@@
-941,7
+941,7
@@
int dmacHw_setControlDescriptor(dmacHw_CONFIG_t *pConfig, /* [ IN ] Configurat
/**
* @brief Sets channel specific user data
*
/**
* @brief Sets channel specific user data
*
-* This function associates user data to a specif DMA channel
+* This function associates user data to a specif
ic
DMA channel
*
*/
/****************************************************************************/
*
*/
/****************************************************************************/