path: root/drivers
diff options
authorOlof Johansson <olof@lixom.net>2012-09-20 16:14:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 19:39:48 -0700
commit974a847e00cf3ff1695e62b276892137893706ab (patch)
treea9454dc32de4738c463f514c37b35106d1e9b2e9 /drivers
parent9cd11c0c47b8690b47e7573311ce5c483cb344ed (diff)
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>
Diffstat (limited to 'drivers')
1 files changed, 0 insertions, 1 deletions
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"