From patchwork Mon Mar 2 06:04:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dudley Du X-Patchwork-Id: 5910301 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 11245BF440 for ; Mon, 2 Mar 2015 06:56:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0CC02201FA for ; Mon, 2 Mar 2015 06:56:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7758201F2 for ; Mon, 2 Mar 2015 06:56:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750834AbbCBG4T (ORCPT ); Mon, 2 Mar 2015 01:56:19 -0500 Received: from smtp1.cypress.com ([157.95.67.100]:46144 "EHLO smtp1.cypress.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750758AbbCBG4S (ORCPT ); Mon, 2 Mar 2015 01:56:18 -0500 X-Greylist: delayed 3034 seconds by postgrey-1.27 at vger.kernel.org; Mon, 02 Mar 2015 01:56:18 EST Received: from corpmail1.cypress.com (corpmail1.mis.cypress.com [172.16.5.228]) by smtp1.cypress.com (8.13.8/8.13.8) with ESMTP id t2265YQY025706; Sun, 1 Mar 2015 22:05:34 -0800 Received: from mailhost.mis.cypress.com (mailhost [172.16.2.5]) by corpmail1.cypress.com (8.14.4/8.14.4) with ESMTP id t2265WMP024186; Sun, 1 Mar 2015 22:05:32 -0800 Received: from localhost ([172.23.6.162]) by mailhost.mis.cypress.com (8.12.11/8.12.11) with ESMTP id t2265U6N015703; Sun, 1 Mar 2015 22:05:31 -0800 (PST) From: Dudley Du To: dmitry.torokhov@gmail.com, jmmahler@gmail.com, rydberg@euromail.se Cc: Dudley Du , bleung@google.com, kbuild-all@01.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] input: cyapa: fix unaligned functions redefinition error Date: Mon, 2 Mar 2015 14:04:38 +0800 Message-Id: <1425276278-12298-1-git-send-email-dudl@cypress.com> X-Mailer: git-send-email 1.9.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Dudley Du --- 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 #include #include -#include +#include #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 #include #include -#include +#include #include #include "cyapa.h"