diff options
Diffstat (limited to 'drivers/staging/meilhaus/me0900_do.c')
| -rw-r--r-- | drivers/staging/meilhaus/me0900_do.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/meilhaus/me0900_do.c b/drivers/staging/meilhaus/me0900_do.c index b5b9c3a98c94..a2275faf1a0c 100644 --- a/drivers/staging/meilhaus/me0900_do.c +++ b/drivers/staging/meilhaus/me0900_do.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" @@ -81,7 +81,7 @@ static int me0900_do_io_reset_subdevice(struct me_subdevice *subdevice, return ME_ERRNO_SUCCESS; } -static int me0900_do_io_single_config(me_subdevice_t * subdevice, +static int me0900_do_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config, @@ -125,7 +125,7 @@ static int me0900_do_io_single_config(me_subdevice_t * subdevice, return err; } -static int me0900_do_io_single_read(me_subdevice_t * subdevice, +static int me0900_do_io_single_read(me_subdevice_t *subdevice, struct file *filep, int channel, int *value, int time_out, int flags) @@ -171,7 +171,7 @@ static int me0900_do_io_single_read(me_subdevice_t * subdevice, return err; } -static int me0900_do_io_single_write(me_subdevice_t * subdevice, +static int me0900_do_io_single_write(me_subdevice_t *subdevice, struct file *filep, int channel, int value, int time_out, int flags) @@ -223,7 +223,7 @@ static int me0900_do_io_single_write(me_subdevice_t * subdevice, return err; } -static int me0900_do_query_number_channels(me_subdevice_t * subdevice, +static int me0900_do_query_number_channels(me_subdevice_t *subdevice, int *number) { PDEBUG("executed.\n"); @@ -231,7 +231,7 @@ static int me0900_do_query_number_channels(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me0900_do_query_subdevice_type(me_subdevice_t * subdevice, +static int me0900_do_query_subdevice_type(me_subdevice_t *subdevice, int *type, int *subtype) { PDEBUG("executed.\n"); @@ -240,7 +240,7 @@ static int me0900_do_query_subdevice_type(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me0900_do_query_subdevice_caps(me_subdevice_t * subdevice, int *caps) +static int me0900_do_query_subdevice_caps(me_subdevice_t *subdevice, int *caps) { PDEBUG("executed.\n"); *caps = 0; |