diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 17:50:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 17:50:53 -0400 |
| commit | 535e0c1726bec699a8f0f5b86fe7d399546b2555 (patch) | |
| tree | 9aa71d6908e4255b5a864cdae14ef164dea66665 /arch/ia64/kernel/dma-mapping.c | |
| parent | 0edfa2b1b5a5e1475e76dd3c792447687d966de4 (diff) | |
| parent | 5afe18d2f58812f3924edbd215464e5e3e8545e7 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] fix csum_ipv6_magic()
[IA64] Fix warning in dma-mapping.c
Diffstat (limited to 'arch/ia64/kernel/dma-mapping.c')
| -rw-r--r-- | arch/ia64/kernel/dma-mapping.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/kernel/dma-mapping.c b/arch/ia64/kernel/dma-mapping.c index 39a3cd0a4173..f2c1600da097 100644 --- a/arch/ia64/kernel/dma-mapping.c +++ b/arch/ia64/kernel/dma-mapping.c | |||
| @@ -10,7 +10,9 @@ EXPORT_SYMBOL(dma_ops); | |||
| 10 | 10 | ||
| 11 | static int __init dma_init(void) | 11 | static int __init dma_init(void) |
| 12 | { | 12 | { |
| 13 | dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES); | 13 | dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES); |
| 14 | |||
| 15 | return 0; | ||
| 14 | } | 16 | } |
| 15 | fs_initcall(dma_init); | 17 | fs_initcall(dma_init); |
| 16 | 18 | ||