diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/arm/kernel/dma-dummy.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/arm/kernel/dma-dummy.c')
| -rw-r--r-- | arch/arm/kernel/dma-dummy.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/kernel/dma-dummy.c b/arch/arm/kernel/dma-dummy.c index db46ef1c3..7efc85363 100644 --- a/arch/arm/kernel/dma-dummy.c +++ b/arch/arm/kernel/dma-dummy.c @@ -8,8 +8,7 @@ */ #include <linux/errno.h> #include <linux/init.h> - -#include <asm/spinlock.h> +#include <linux/spinlock.h> spinlock_t dma_spin_lock = SPIN_LOCK_UNLOCKED; @@ -27,6 +26,6 @@ int get_dma_list(char *buf) return 0; } -__initfunc(void init_dma(void)) +void __init init_dma(void) { } |