ARM: Merge for-2635/samsung-dma
Merge branch 'for-2635/samsung-dma' into for-linus/samsung2
This commit is contained in:
Коммит
c733a7179c
|
@ -414,7 +414,7 @@ err_buff:
|
|||
EXPORT_SYMBOL(s3c2410_dma_enqueue);
|
||||
|
||||
|
||||
int s3c2410_dma_devconfig(int channel,
|
||||
int s3c2410_dma_devconfig(unsigned int channel,
|
||||
enum s3c2410_dmasrc source,
|
||||
unsigned long devaddr)
|
||||
{
|
||||
|
|
|
@ -1104,7 +1104,7 @@ EXPORT_SYMBOL(s3c2410_dma_config);
|
|||
* devaddr: physical address of the source
|
||||
*/
|
||||
|
||||
int s3c2410_dma_devconfig(int channel,
|
||||
int s3c2410_dma_devconfig(unsigned int channel,
|
||||
enum s3c2410_dmasrc source,
|
||||
unsigned long devaddr)
|
||||
{
|
||||
|
|
|
@ -110,8 +110,8 @@ extern int s3c2410_dma_config(unsigned int channel, int xferunit);
|
|||
* configure the device we're talking to
|
||||
*/
|
||||
|
||||
extern int s3c2410_dma_devconfig(int channel, enum s3c2410_dmasrc source,
|
||||
unsigned long devaddr);
|
||||
extern int s3c2410_dma_devconfig(unsigned int channel,
|
||||
enum s3c2410_dmasrc source, unsigned long devaddr);
|
||||
|
||||
/* s3c2410_dma_getposition
|
||||
*
|
||||
|
|
Загрузка…
Ссылка в новой задаче