Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / staging / meilhaus / me1000_dio.c

diff --git a/drivers/staging/meilhaus/me1000_dio.c b/drivers/staging/meilhaus/me1000_dio.c
index 87605a9108ae350d4fbbb858c170f8989361a138..2d7ed07d1f39880562ed4d6d07a3396a0c3aa2d0 100644 (file)
--- a/drivers/staging/meilhaus/me1000_dio.c
+++ b/drivers/staging/meilhaus/me1000_dio.c
@@ -36,7 +36,7 @@
 
 #include <linux/slab.h>
 #include <linux/spinlock.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/types.h>
 
 #include "medefines.h"
@@ -371,7 +371,7 @@ static int me1000_dio_query_subdevice_caps(struct me_subdevice *subdevice,
 
 me1000_dio_subdevice_t *me1000_dio_constructor(uint32_t reg_base,
                                               unsigned int dio_idx,
-                                              spinlock_t * ctrl_reg_lock)
+                                              spinlock_t *ctrl_reg_lock)
 {
        me1000_dio_subdevice_t *subdevice;
        int err;