2012-11-08 06:27:39

by Sachin Kamat

Subject: [PATCH 1/1] crypto: s5p-sss: Fix compilation error

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 <[email protected]>
---
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 <crypto/ctr.h>

#include <plat/cpu.h>
-#include <plat/dma.h>
+#include <mach/dma.h>

#define _SBF(s, v) ((v) << (s))
#define _BIT(b) _SBF(b, 1)
--
1.7.4.1

2012-11-09 09:35:45

by Herbert Xu

Subject: Re: [PATCH 1/1] crypto: s5p-sss: Fix compilation error

On Thu, Nov 08, 2012 at 11:52:00AM +0530, Sachin Kamat wrote:
> 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 <[email protected]>

Patch applied. Thanks!
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt