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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
arm
/
mach-bcmring
/
include
/
csp
/
dmacHw.h
diff --git
a/arch/arm/mach-bcmring/include/csp/dmacHw.h
b/arch/arm/mach-bcmring/include/csp/dmacHw.h
index
6c8da2b
..
e6a1dc4
100644
(file)
--- a/
arch/arm/mach-bcmring/include/csp/dmacHw.h
+++ b/
arch/arm/mach-bcmring/include/csp/dmacHw.h
@@
-362,7
+362,7
@@
int dmacHw_setControlDescriptor(dmacHw_CONFIG_t *pConfig, /* [ IN ] Configurati
/**
* @brief Read data DMA transferred to memory
*
/**
* @brief Read data DMA transferred 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
*
@@
-446,7
+446,7
@@
void dmacHw_stopTransfer(dmacHw_HANDLE_t handle /* [ IN ] DMA Channel handle *
/****************************************************************************/
/**
/****************************************************************************/
/**
-* @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
@@
-542,7
+542,7
@@
dmacHw_HANDLE_t dmacHw_getInterruptSource(void);
/**
* @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
*
*/
/****************************************************************************/
*
*/
/****************************************************************************/