Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c733a717 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge for-2635/samsung-dma 

Merge branch 'for-2635/samsung-dma' into for-linus/samsung2
parents 359542b2 14894b9b

arch/arm/mach-s3c64xx/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id, 
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)

{

arch/arm/plat-s3c24xx/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

arch/arm/plat-samsung/include/plat/dma.h

+2 −2
Original line number Diff line number Diff line
@@ -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

 *