diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-25 18:46:44 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-25 18:46:44 -0400 |
| commit | 05cb784c81a0fd1f97732156ea464bd392ce875a (patch) | |
| tree | 24122979b411dcec6ff390fc9ae84ad9413128e9 /arch/arm/mach-s3c2410/dma.c | |
| parent | 3190186362466658f01b2e354e639378ce07e1a9 (diff) | |
| parent | 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm/mach-s3c2410/dma.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c index c7c28890d406..65feaf20d23e 100644 --- a/arch/arm/mach-s3c2410/dma.c +++ b/arch/arm/mach-s3c2410/dma.c | |||
| @@ -436,7 +436,7 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id, | |||
| 436 | 436 | ||
| 437 | buf = kmem_cache_alloc(dma_kmem, GFP_ATOMIC); | 437 | buf = kmem_cache_alloc(dma_kmem, GFP_ATOMIC); |
| 438 | if (buf == NULL) { | 438 | if (buf == NULL) { |
| 439 | pr_debug("%s: out of memory (%d alloc)\n", | 439 | pr_debug("%s: out of memory (%ld alloc)\n", |
| 440 | __FUNCTION__, sizeof(*buf)); | 440 | __FUNCTION__, sizeof(*buf)); |
| 441 | return -ENOMEM; | 441 | return -ENOMEM; |
| 442 | } | 442 | } |