Import 2.3.18pre1

[davej-history.git] / drivers / sound / maestro.c

diff --git a/drivers/sound/maestro.cb/drivers/sound/maestro.c
index 8ccc212..3f9250b 100644 (file)
--- a/drivers/sound/maestro.c
+++ b/drivers/sound/maestro.c
@@ -118,7+118,7 @@
 #include <asm/dma.h> #include <linux/init.h> #include <linux/poll.h> #include <asm/dma.h> #include <linux/init.h> #include <linux/poll.h>
-#include <asm/spinlock.h>+#include <linux/spinlock.h>
 #include <asm/uaccess.h> #include <asm/hardirq.h>  #include <asm/uaccess.h> #include <asm/hardirq.h>