From patchwork Sat Mar 18 18:21:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Trofimovich X-Patchwork-Id: 9632291 X-Patchwork-Delegate: sameo@linux.intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 83BA76024A for ; Sat, 18 Mar 2017 18:24:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67D8D2836B for ; Sat, 18 Mar 2017 18:24:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A1A52838E; Sat, 18 Mar 2017 18:24:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9B9F2836B for ; Sat, 18 Mar 2017 18:24:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751253AbdCRSXp (ORCPT ); Sat, 18 Mar 2017 14:23:45 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:49750 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751391AbdCRSXn (ORCPT ); Sat, 18 Mar 2017 14:23:43 -0400 Received: from sf.home (host81-129-87-182.range81-129.btcentralplus.com [81.129.87.182]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: slyfox) by smtp.gentoo.org (Postfix) with ESMTPSA id 0BA7A341586; Sat, 18 Mar 2017 18:21:15 +0000 (UTC) Received: by sf.home (Postfix, from userid 1000) id 9DB9E1AB0324C; Sat, 18 Mar 2017 18:21:11 +0000 (GMT) From: Sergei Trofimovich To: Andrew Morton Cc: Sergei Trofimovich , Charles Gorand , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nfc@lists.01.org Subject: [PATCH] nfc: ia64: fix redefinition of 'put_unaligned_be64' Date: Sat, 18 Mar 2017 18:21:03 +0000 Message-Id: <20170318182103.10965-1-slyfox@gentoo.org> X-Mailer: git-send-email 2.12.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ia64 allmodconfig build failed as: In file included from /home/slyfox/linux-2.6/drivers/nfc/nxp-nci/i2c.c:39:0: linux/include/linux/unaligned/access_ok.h:62:29: error: redefinition of 'put_unaligned_be64' static __always_inline void put_unaligned_be64(u64 val, void *p) ^ In file included from linux/arch/ia64/include/asm/unaligned.h:5:0, ... linux/include/linux/unaligned/be_byteshift.h:65:20: note: previous definition of 'put_unaligned_be64' was here static inline void put_unaligned_be64(u64 val, void *p) ^ The error here is the inclusion of #include header instead of #include for unaligned helpers. CC: Charles Gorand CC: linux-wireless@vger.kernel.org CC: linux-kernel@vger.kernel.org CC: linux-nfc@lists.01.org Signed-off-by: Sergei Trofimovich --- drivers/nfc/nfcmrvl/fw_dnld.c | 2 +- drivers/nfc/nxp-nci/firmware.c | 2 +- drivers/nfc/nxp-nci/i2c.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/nfc/nfcmrvl/fw_dnld.c b/drivers/nfc/nfcmrvl/fw_dnld.c index f8dcdf4b24f6..b93b913e8983 100644 --- a/drivers/nfc/nfcmrvl/fw_dnld.c +++ b/drivers/nfc/nfcmrvl/fw_dnld.c @@ -17,7 +17,7 @@ */ #include -#include +#include #include #include #include diff --git a/drivers/nfc/nxp-nci/firmware.c b/drivers/nfc/nxp-nci/firmware.c index 5291797324ba..432f58fe327c 100644 --- a/drivers/nfc/nxp-nci/firmware.c +++ b/drivers/nfc/nxp-nci/firmware.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "nxp-nci.h" diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c index 36099e557730..a926be0d784e 100644 --- a/drivers/nfc/nxp-nci/i2c.c +++ b/drivers/nfc/nxp-nci/i2c.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include