Commit 974a847e authored by Olof Johansson's avatar Olof Johansson Committed by Linus Torvalds
Browse files

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: default avatarOlof 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: default avatarLinus Torvalds <>
parent 9cd11c0c
......@@ -28,7 +28,6 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include "soc.h"
#include "omap_l3_noc.h"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment