summaryrefslogtreecommitdiffstats
path: root/kernel/dma.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
commitd6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch)
treee2be02f33984c48ec019c654051d27964e42c441 /kernel/dma.c
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'kernel/dma.c')
-rw-r--r--kernel/dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/dma.c b/kernel/dma.c
index 4ae38f4e5..e9f0f7a52 100644
--- a/kernel/dma.c
+++ b/kernel/dma.c
@@ -12,9 +12,9 @@
#include <linux/kernel.h>
#include <linux/errno.h>
+#include <linux/spinlock.h>
#include <asm/dma.h>
#include <asm/system.h>
-#include <asm/spinlock.h>
/* A note on resource allocation: