fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / arm26 / machine / dma.c

diff --git a/arch/arm26/machine/dma.c b/arch/arm26/machine/dma.c
index 44090c4..4402a5a 100644 (file)
--- a/arch/arm26/machine/dma.c
+++ b/arch/arm26/machine/dma.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/arm/kernel/dma-arc.c
+ *  linux/arch/arm26/kernel/dma.c
  *
  *  Copyright (C) 1998-1999 Dave Gilbert / Russell King
  *  Copyright (C) 2003 Ian Molton
@@ -10,7 +10,6 @@
  *
  *  DMA functions specific to Archimedes and A5000 architecture
  */
-#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/init.h>
 
@@ -47,7 +46,7 @@ static void arc_floppy_data_enable_dma(dmach_t channel, dma_t *dma)
                        &fdc1772_dma_read_end - &fdc1772_dma_read);
                fdc1772_setupdma(dma->buf.length, dma->buf.__address); /* Sets data pointer up */
                enable_fiq(FIQ_FLOPPYDATA);
-               loacl_irq_restore(flags);
+               local_irq_restore(flags);
           }
           break;