diff options
Diffstat (limited to 'drivers/staging/meilhaus/me4600_do.c')
-rw-r--r-- | drivers/staging/meilhaus/me4600_do.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/meilhaus/me4600_do.c b/drivers/staging/meilhaus/me4600_do.c index ee591bc1185e..39510f3e6e67 100644 --- a/drivers/staging/meilhaus/me4600_do.c +++ b/drivers/staging/meilhaus/me4600_do.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" @@ -93,7 +93,7 @@ static int me4600_do_io_reset_subdevice(struct me_subdevice *subdevice, return ME_ERRNO_SUCCESS; } -static int me4600_do_io_single_config(me_subdevice_t * subdevice, +static int me4600_do_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config, @@ -224,7 +224,7 @@ static int me4600_do_io_single_config(me_subdevice_t * subdevice, return err; } -static int me4600_do_io_single_read(me_subdevice_t * subdevice, +static int me4600_do_io_single_read(me_subdevice_t *subdevice, struct file *filep, int channel, int *value, int time_out, int flags) @@ -284,7 +284,7 @@ static int me4600_do_io_single_read(me_subdevice_t * subdevice, return err; } -static int me4600_do_io_single_write(me_subdevice_t * subdevice, +static int me4600_do_io_single_write(me_subdevice_t *subdevice, struct file *filep, int channel, int value, int time_out, int flags) @@ -352,7 +352,7 @@ static int me4600_do_io_single_write(me_subdevice_t * subdevice, return err; } -static int me4600_do_query_number_channels(me_subdevice_t * subdevice, +static int me4600_do_query_number_channels(me_subdevice_t *subdevice, int *number) { PDEBUG("executed.\n"); @@ -360,7 +360,7 @@ static int me4600_do_query_number_channels(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me4600_do_query_subdevice_type(me_subdevice_t * subdevice, +static int me4600_do_query_subdevice_type(me_subdevice_t *subdevice, int *type, int *subtype) { PDEBUG("executed.\n"); @@ -369,7 +369,7 @@ static int me4600_do_query_subdevice_type(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me4600_do_query_subdevice_caps(me_subdevice_t * subdevice, int *caps) +static int me4600_do_query_subdevice_caps(me_subdevice_t *subdevice, int *caps) { PDEBUG("executed.\n"); *caps = 0; @@ -377,7 +377,7 @@ static int me4600_do_query_subdevice_caps(me_subdevice_t * subdevice, int *caps) } me4600_do_subdevice_t *me4600_do_constructor(uint32_t reg_base, - spinlock_t * ctrl_reg_lock) + spinlock_t *ctrl_reg_lock) { me4600_do_subdevice_t *subdevice; int err; |