diff options
Diffstat (limited to 'drivers/staging/meilhaus/me0600_ttli.c')
-rw-r--r-- | drivers/staging/meilhaus/me0600_ttli.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/meilhaus/me0600_ttli.c b/drivers/staging/meilhaus/me0600_ttli.c index ab8e13b6f32..7d970f584cc 100644 --- a/drivers/staging/meilhaus/me0600_ttli.c +++ b/drivers/staging/meilhaus/me0600_ttli.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" @@ -67,7 +67,7 @@ static int me0600_ttli_io_reset_subdevice(struct me_subdevice *subdevice, return ME_ERRNO_SUCCESS; } -static int me0600_ttli_io_single_config(me_subdevice_t * subdevice, +static int me0600_ttli_io_single_config(me_subdevice_t *subdevice, struct file *filep, int channel, int single_config, @@ -116,7 +116,7 @@ static int me0600_ttli_io_single_config(me_subdevice_t * subdevice, return err; } -static int me0600_ttli_io_single_read(me_subdevice_t * subdevice, +static int me0600_ttli_io_single_read(me_subdevice_t *subdevice, struct file *filep, int channel, int *value, int time_out, int flags) @@ -164,7 +164,7 @@ static int me0600_ttli_io_single_read(me_subdevice_t * subdevice, return err; } -static int me0600_ttli_query_number_channels(me_subdevice_t * subdevice, +static int me0600_ttli_query_number_channels(me_subdevice_t *subdevice, int *number) { PDEBUG("executed.\n"); @@ -172,7 +172,7 @@ static int me0600_ttli_query_number_channels(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me0600_ttli_query_subdevice_type(me_subdevice_t * subdevice, +static int me0600_ttli_query_subdevice_type(me_subdevice_t *subdevice, int *type, int *subtype) { PDEBUG("executed.\n"); @@ -181,7 +181,7 @@ static int me0600_ttli_query_subdevice_type(me_subdevice_t * subdevice, return ME_ERRNO_SUCCESS; } -static int me0600_ttli_query_subdevice_caps(me_subdevice_t * subdevice, +static int me0600_ttli_query_subdevice_caps(me_subdevice_t *subdevice, int *caps) { PDEBUG("executed.\n"); |