X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fdma.c;h=aef0a45b7893db2c7a5a2c94f67da7618e181bc9;hb=f3b843e558cd01b1e629d000e2865812b7fd91a4;hp=af1d982a0c57682df6e4671591679a611bd357ec;hpb=daddc0d38b3571bed170afa273a49a0eba090c1e;p=linux-2.6.git

diff --git a/kernel/dma.c b/kernel/dma.c
index af1d982a0..aef0a45b7 100644
--- a/kernel/dma.c
+++ b/kernel/dma.c
@@ -38,7 +38,7 @@
  */
 
 
-spinlock_t dma_spin_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(dma_spin_lock);
 
 /*
  *	If our port doesn't define this it has no PC like DMA
@@ -58,14 +58,7 @@ struct dma_chan {
 };
 
 static struct dma_chan dma_chan_busy[MAX_DMA_CHANNELS] = {
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 1, "cascade" },
-	{ 0, 0 },
-	{ 0, 0 },
-	{ 0, 0 }
+	[4] = { 1, "cascade" },
 };