Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17a28055 authored Mar 02, 2015 by Dudley Du Committed by Dmitry Torokhov Mar 02, 2015

Input: cyapa - fix unaligned functions redefinition error



Use asm/unaligned.h instead of linux/unaligned/access_ok.h header 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>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

parent 71daf894

drivers/input/mouse/cyapa_gen3.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,7 @@
	#include <linux/input/mt.h>		#include <linux/input/mt.h>
	#include <linux/module.h>		#include <linux/module.h>
	#include <linux/slab.h>		#include <linux/slab.h>
	#include <linux/unaligned/access_ok.h>		#include <asm/unaligned.h>
	#include "cyapa.h"		#include "cyapa.h"

drivers/input/mouse/cyapa_gen5.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,7 @@
	#include <linux/mutex.h>		#include <linux/mutex.h>
	#include <linux/completion.h>		#include <linux/completion.h>
	#include <linux/slab.h>		#include <linux/slab.h>
	#include <linux/unaligned/access_ok.h>		#include <asm/unaligned.h>
	#include <linux/crc-itu-t.h>		#include <linux/crc-itu-t.h>
	#include "cyapa.h"		#include "cyapa.h"