Merge branch 'omap-pool'

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

diff --git a/drivers/staging/meilhaus/me8255.c b/drivers/staging/meilhaus/me8255.c
index 180e7f8d21467f9f5ead556b496ec4facc8456ec..ec9c6389752f7a2f757c22e20f70a07357dd6c11 100644 (file)
--- a/drivers/staging/meilhaus/me8255.c
+++ b/drivers/staging/meilhaus/me8255.c
@@ -35,7 +35,7 @@
 
 #include <linux/slab.h>
 #include <linux/spinlock.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/types.h>
 
 #include "medefines.h"
@@ -318,7 +318,7 @@ me8255_subdevice_t *me8255_constructor(uint32_t device_id,
                                       unsigned int me8255_idx,
                                       unsigned int dio_idx,
                                       int *ctrl_reg_mirror,
-                                      spinlock_t * ctrl_reg_lock)
+                                      spinlock_t *ctrl_reg_lock)
 {
        me8255_subdevice_t *subdevice;
        int err;