From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 2 May 2013 20:20:46 +0000 (+0100)
Subject: Merge commit '73053d973' into smp-hotplug
X-Git-Tag: firefly_0821_release~3680^2~588^2~1^6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5e45a0a1975df83fc068349e6a31fdf6af61a458;p=firefly-linux-kernel-4.4.55.git

Merge commit '73053d973' into smp-hotplug

This is to fix a merge problem with mach-highbank/hotplug.c, which git
silently resolves, but wrongly.  This commit contains the correct
resolution.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

5e45a0a1975df83fc068349e6a31fdf6af61a458
diff --cc arch/arm/mach-highbank/hotplug.c
index 35dd42e21685,890cae23c12a..a019e4e86e51
--- a/arch/arm/mach-highbank/hotplug.c
+++ b/arch/arm/mach-highbank/hotplug.c
@@@ -14,6 -14,8 +14,7 @@@
   * this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  #include <linux/kernel.h>
 -
+ #include <asm/cacheflush.h>
  
  #include "core.h"
  #include "sysregs.h"