]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Remove stale .rej file
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 22 Jul 2012 23:38:53 +0000 (09:38 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Sun, 22 Jul 2012 23:38:53 +0000 (09:38 +1000)
Commit 9778b696a0188ad3b3524b383953ee73b31b7b68 accidentally added
a .rej file (probably my fault), remove it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/kernel/iommu.c.rej [deleted file]

diff --git a/arch/powerpc/kernel/iommu.c.rej b/arch/powerpc/kernel/iommu.c.rej
deleted file mode 100644 (file)
index 9d10d34..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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