Compilation fixes on powerpc

diff --git a/comedi/drivers/mite.c b/comedi/drivers/mite.c
index 2173b55059c746cdab970859c1c89aceeecb6e95..f72168ebf4bd005d5fc49a6e74b38fe293e22a37 100644 (file)
--- a/comedi/drivers/mite.c
+++ b/comedi/drivers/mite.c
@@ -469,11 +469,11 @@ void mite_setregs(struct mite_struct *mite,unsigned long ll_start,int chan,int d
 
 int mite_bytes_transferred(struct mite_struct *mite, int chan)
 {
-       int DAR, FCR;
+       int dar, fcr;
        
-       DAR = readl(mite->mite_io_addr+MITE_DAR+CHAN_OFFSET(chan));
-       FCR = readl(mite->mite_io_addr+MITE_FCR+CHAN_OFFSET(chan)) & 0x000000FF;
-       return DAR-FCR;
+       dar = readl(mite->mite_io_addr+MITE_DAR+CHAN_OFFSET(chan));
+       fcr = readl(mite->mite_io_addr+MITE_FCR+CHAN_OFFSET(chan)) & 0x000000FF;
+       return dar-fcr;
 }
 
 int mite_dma_tcr(struct mite_struct *mite)

diff --git a/comedi/drivers/pcl818.c b/comedi/drivers/pcl818.c
index 1a6aac796add3fb234bec3fb3fe36df9018a2a70..f6a88a499b21511ea82720934e4244a3da712e88 100644 (file)
--- a/comedi/drivers/pcl818.c
+++ b/comedi/drivers/pcl818.c
@@ -68,6 +68,7 @@
 #include <linux/ioport.h>
 #include <linux/module.h>
 #include <linux/mc146818rtc.h>
+#include <linux/delay.h>
 #include <asm/dma.h>
 #include <linux/comedidev.h>
 #include <8253.h>

diff --git a/comedi/kvmem.h b/comedi/kvmem.h
index deb540a4dedd60d33d6d6631caa260a7522263b3..9b1960a7c8c038e54d751406ea270d0525a61922 100644 (file)
--- a/comedi/kvmem.h
+++ b/comedi/kvmem.h
@@ -6,6 +6,7 @@
 #define _KVMEM_H
 #include <linux/version.h>
 #include <linux/malloc.h>
+#include <linux/vmalloc.h>
 #include <linux/wrapper.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>