Commit 974a847e authored Sep 20, 2012 by Olof Johansson Committed by Linus Torvalds Oct 01, 2012

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>

parent 9cd11c0c

drivers/bus/omap_l3_noc.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,6 @@
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/slab.h>		#include <linux/slab.h>

	#include "soc.h"
	#include "omap_l3_noc.h"		#include "omap_l3_noc.h"

	/*		/*