Re: [PATCH] input: cyapa: fix unaligned functions redefinition error

From: Dmitry Torokhov
Date: Mon Mar 02 2015 - 12:39:01 EST


On Mon, Mar 02, 2015 at 02:04:38PM +0800, Dudley Du wrote:
> Use asm/unaligned.h instead of linux/unaligned/access_ok.h head file to
> fix compiling issues such as following while doing cross platform compiling.
> "include/linux/unaligned/access_ok.h:7:19: error: redefinition of
> 'get_unaligned_le16'
> ...
> include/linux/unaligned/le_struct.h:6:19: note: previous definition of
> 'get_unaligned_le16' was here".
>
> Reported-by: kbuild test robot <kbuild-all@xxxxxx>
> Signed-off-by: Dudley Du <dudl@xxxxxxxxxxx>

Applied, thank you.

> ---
> drivers/input/mouse/cyapa_gen3.c | 2 +-
> drivers/input/mouse/cyapa_gen5.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/mouse/cyapa_gen3.c b/drivers/input/mouse/cyapa_gen3.c
> index 77e9d70..1e2291c 100644
> --- a/drivers/input/mouse/cyapa_gen3.c
> +++ b/drivers/input/mouse/cyapa_gen3.c
> @@ -20,7 +20,7 @@
> #include <linux/input/mt.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> -#include <linux/unaligned/access_ok.h>
> +#include <asm/unaligned.h>
> #include "cyapa.h"
>
>
> diff --git a/drivers/input/mouse/cyapa_gen5.c b/drivers/input/mouse/cyapa_gen5.c
> index ddf5393..aa68edd 100644
> --- a/drivers/input/mouse/cyapa_gen5.c
> +++ b/drivers/input/mouse/cyapa_gen5.c
> @@ -17,7 +17,7 @@
> #include <linux/mutex.h>
> #include <linux/completion.h>
> #include <linux/slab.h>
> -#include <linux/unaligned/access_ok.h>
> +#include <asm/unaligned.h>
> #include <linux/crc-itu-t.h>
> #include "cyapa.h"
>
> --
> 1.9.1
>

--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/