From patchwork Thu Nov 8 06:22:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 12758 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 0E58D23E13 for ; Thu, 8 Nov 2012 06:27:42 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id A5E97A194BF for ; Thu, 8 Nov 2012 06:27:41 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so1650907iag.11 for ; Wed, 07 Nov 2012 22:27:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=ae5XMl0mvjRFUrfcRyrJHXCabzRNIFKKcwEztDZfkyc=; b=Tz3bR6i0K1U7IdJ+TtKDnND0DW+wHoDjUM99LqMdu35inRY5SN1vJlbuZed5iuS7JY Sh3oARK2uXlS6s8GS/PshtuNFj5fGhBVCtqyPn1jucqnOyxmDWp/mHWlP8SRWAmrsZCi 1YSxDH0fuOUbGU26NUgrvCfeM7ze9CGpeAFQQwF3+4mr24J5DJ9p6RCkWSCPsXjBzQnB VVZ95NXFYUk9f48XmsIHg8Pwe842tjkVsTQAsZHNiLEtRijV0Ol5YWbeavgBCTWCHC4f KwU7h4BEnD0yPCsZLcH93ycChtFWgOQY0sQ+Tb/Liiww0GIBLpU7kW3qPeCFSDPTEZ29 vJgg== Received: by 10.50.237.69 with SMTP id va5mr4415221igc.62.1352356060758; Wed, 07 Nov 2012 22:27:40 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp329691igt; Wed, 7 Nov 2012 22:27:40 -0800 (PST) Received: by 10.68.234.100 with SMTP id ud4mr20829899pbc.82.1352356059827; Wed, 07 Nov 2012 22:27:39 -0800 (PST) Received: from mail-pb0-f52.google.com (mail-pb0-f52.google.com [209.85.160.52]) by mx.google.com with ESMTPS id ax10si34389645pbd.104.2012.11.07.22.27.39 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 22:27:39 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.52 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.160.52; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.52 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by mail-pb0-f52.google.com with SMTP id rr13so2068522pbb.39 for ; Wed, 07 Nov 2012 22:27:39 -0800 (PST) Received: by 10.68.232.2 with SMTP id tk2mr14744480pbc.92.1352356059298; Wed, 07 Nov 2012 22:27:39 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id sg7sm15413115pbb.50.2012.11.07.22.27.36 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Nov 2012 22:27:38 -0800 (PST) From: Sachin Kamat To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, davem@davemloft.net, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 1/1] crypto: s5p-sss: Fix compilation error Date: Thu, 8 Nov 2012 11:52:00 +0530 Message-Id: <1352355720-31685-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQlFjxDekz65Fxdo/ZCX94MY05wMeR6O2sEL8g2cc8T/5b/KLuFTvHNa9QJESAU/gPelNY+1 struct s3c2410_dma_client gets defined multiple times as it is defined in more than one header file. Changing it at the header file level causes many more build breakages as they are interdependent in a complex way. Hence fixing this problem by using the mach version of the header file. Without this patch, following build error is observed: arch/arm/plat-samsung/include/plat/dma-pl330.h:106:27: error: redefinition of struct s3c2410_dma_client Signed-off-by: Sachin Kamat --- Build tested using s5pv210_defconfig from the linux-next tree. --- drivers/crypto/s5p-sss.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c index a227144..49ad8cb 100644 --- a/drivers/crypto/s5p-sss.c +++ b/drivers/crypto/s5p-sss.c @@ -30,7 +30,7 @@ #include #include -#include +#include #define _SBF(s, v) ((v) << (s)) #define _BIT(b) _SBF(b, 1)