From 974a847e00cf3ff1695e62b276892137893706ab Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Thu, 20 Sep 2012 16:14:25 -0700 Subject: [PATCH] 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 [ .. 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 --- drivers/bus/omap_l3_noc.c | 1 - 1 file changed, 1 deletion(-) 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 #include -#include "soc.h" #include "omap_l3_noc.h" /* -- 2.20.1