From: Olof Johansson <olof@lixom.net>
Date: Thu, 20 Sep 2012 23:14:25 +0000 (-0700)
Subject: drivers: bus: omap_l3: fixup merge conflict resolution
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=974a847e00cf3ff1695e62b276892137893706ab;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

drivers: bus: omap_l3: fixup merge conflict resolution

This fixes a local merge conflict resolution done wrong locally in
arm-soc for-next. soc.h was added on a cleanup branch, but the driver
was moved and the header no longer needed.

Signed-off-by: Olof Johansson <olof@lixom.net>
[ .. and I did the same wrong merge, since git automatically does the
  whole rename detection etc, so applying this patch from Olof  - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/bus/omap_l3_noc.c b/drivers/bus/omap_l3_noc.c
index 44b2b3e57882..ab911a33f8a8 100644
--- a/drivers/bus/omap_l3_noc.c
+++ b/drivers/bus/omap_l3_noc.c
@@ -28,7 +28,6 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 
-#include "soc.h"
 #include "omap_l3_noc.h"
 
 /*