From 15b7e6fecb59c7f515bf66a7ca4a0aa29b46ef28 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Thu, 27 Dec 2012 20:56:15 +0100
Subject: score: Remove unneeded <asm/dma-mapping.h>

It just includes <asm-generic/dma-mapping-broken.h>, which is already
handled by <linux/dma-mapping.h> for the !CONFIG_HAS_DMA case (score sets
CONFIG_NO_DMA=y).

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
---
 arch/score/include/asm/dma-mapping.h | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 arch/score/include/asm/dma-mapping.h

(limited to 'arch/score/include')

diff --git a/arch/score/include/asm/dma-mapping.h b/arch/score/include/asm/dma-mapping.h
deleted file mode 100644
index f9c0193c7a53..000000000000
--- a/arch/score/include/asm/dma-mapping.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SCORE_DMA_MAPPING_H
-#define _ASM_SCORE_DMA_MAPPING_H
-
-#include <asm-generic/dma-mapping-broken.h>
-
-#endif /* _ASM_SCORE_DMA_MAPPING_H */
-- 
cgit v1.2.3


From 80ebf14546647e581e10e2cb14425a3621e782e0 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue, 14 May 2013 09:26:28 +0200
Subject: score: Wire up asm-generic/xor.h

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 arch/score/include/asm/Kbuild | 1 +
 1 file changed, 1 insertion(+)

(limited to 'arch/score/include')

diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
index cebaff8069a1..e1c7bb999b06 100644
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@ -3,3 +3,4 @@ header-y +=
 
 generic-y += clkdev.h
 generic-y += trace_clock.h
+generic-y += xor.h
-- 
cgit v1.2.3