Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2a10e7c41254941cac87be1eccdcb6379ce097f5

Authored by WANG Cong
Committed by Ingo Molnar
1 parent bd61643ef6
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

git-x86: unbreak UML 

Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Showing 1 changed file with 6 additions and 0 deletions Side-by-side Diff

include/asm-um/nops.h
Diff comments   View file @ 2a10e7c
  1 +#ifndef __UM_NOPS_H
  2 +#define __UM_NOPS_H
  3 +
  4 +#include "asm/arch/nops.h"
  5 +
  6 +#endif