The patch titled
Subject: lib/scatterlist: make ARCH_HAS_SG_CHAIN an actual Kconfig fix
has been removed from the -mm tree. Its filename was
lib-scatterlist-make-arch_has_sg_chain-an-actual-kconfig-fix-3.patch
This patch was dropped because it was folded into lib-scatterlist-make-arch_has_sg_chain-an-actual-kconfig.patch
------------------------------------------------------
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: lib/scatterlist: make ARCH_HAS_SG_CHAIN an actual Kconfig fix
powerpc files now need asm/dma.h
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Laura Abbott <lauraa@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/mm/dma-noncoherent.c | 1 +
arch/powerpc/platforms/44x/warp.c | 1 +
2 files changed, 2 insertions(+)
diff -puN arch/powerpc/mm/dma-noncoherent.c~lib-scatterlist-make-arch_has_sg_chain-an-actual-kconfig-fix-3 arch/powerpc/mm/dma-noncoherent.c
--- a/arch/powerpc/mm/dma-noncoherent.c~lib-scatterlist-make-arch_has_sg_chain-an-actual-kconfig-fix-3
+++ a/arch/powerpc/mm/dma-noncoherent.c
@@ -33,6 +33,7 @@
#include <linux/export.h>
#include <asm/tlbflush.h>
+#include <asm/dma.h>
#include "mmu_decl.h"
diff -puN arch/powerpc/platforms/44x/warp.c~lib-scatterlist-make-arch_has_sg_chain-an-actual-kconfig-fix-3 arch/powerpc/platforms/44x/warp.c
--- a/arch/powerpc/platforms/44x/warp.c~lib-scatterlist-make-arch_has_sg_chain-an-actual-kconfig-fix-3
+++ a/arch/powerpc/platforms/44x/warp.c
@@ -25,6 +25,7 @@
#include <asm/time.h>
#include <asm/uic.h>
#include <asm/ppc4xx.h>
+#include <asm/dma.h>
static __initdata struct of_device_id warp_of_bus[] = {
_
Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are
origin.patch
lib-scatterlist-make-arch_has_sg_chain-an-actual-kconfig.patch
purgatory-core-purgatory-functionality-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
