luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers: bus: omap_l3: fixup merge conflict resolution

Browse Source 
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>
This commit is contained in:
Olof Johansson 2012-09-20 16:14:25 -07:00 committed by Linus Torvalds
parent 9cd11c0c47
commit 974a847e00
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/bus/omap_l3_noc.c
View File

@ -28,7 +28,6 @@
#include <linux/kernel.h>
#include <linux/slab.h>
#include "soc.h"
#include "omap_l3_noc.h"
/*