Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 668fcb69 authored Jul 23, 2012 by Benjamin Herrenschmidt

Remove stale .rej file



Commit 9778b696 accidentally added
a .rej file (probably my fault), remove it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent dcd261ba

arch/powerpc/kernel/iommu.c.rej

deleted100644 → 0

+0 −22

Original line number	Diff line number	Diff line
		--- arch/powerpc/kernel/iommu.c 2012-06-08 09:01:02.785709100 +1000
		+++ arch/powerpc/kernel/iommu.c 2012-06-08 09:01:07.489784856 +1000
		@@ -33,7 +33,9 @@
		#include <linux/bitmap.h>
		#include <linux/iommu-helper.h>
		#include <linux/crash_dump.h>
		+#include <linux/fault-inject.h>
		#include <asm/io.h>
		+#include <asm/vio.h>
		#include <asm/prom.h>
		#include <asm/iommu.h>
		#include <asm/pci-bridge.h>
		@@ -171,6 +261,9 @@
		return DMA_ERROR_CODE;
		}

		+ if (should_fail_iommu(dev))
		+ return DMA_ERROR_CODE;
		+
		if (handle && *handle)
		start = *handle;
		else