* [PATCH] input: cyapa: fix unaligned functions redefinition error
@ 2015-03-02 6:04 Dudley Du
2015-03-02 17:38 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Dudley Du @ 2015-03-02 6:04 UTC (permalink / raw)
To: dmitry.torokhov, jmmahler, rydberg
Cc: Dudley Du, bleung, kbuild-all, linux-input, linux-kernel
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@01.org>
Signed-off-by: Dudley Du <dudl@cypress.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] input: cyapa: fix unaligned functions redefinition error
2015-03-02 6:04 [PATCH] input: cyapa: fix unaligned functions redefinition error Dudley Du
@ 2015-03-02 17:38 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2015-03-02 17:38 UTC (permalink / raw)
To: Dudley Du
Cc: jmmahler, rydberg, bleung, kbuild-all, linux-input, linux-kernel
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@01.org>
> Signed-off-by: Dudley Du <dudl@cypress.com>
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-02 17:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-02 6:04 [PATCH] input: cyapa: fix unaligned functions redefinition error Dudley Du
2015-03-02 17:38 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).