diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-07-06 14:33:17 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-07-06 14:33:17 +0200 |
| commit | ae745302c0a3e2b5b768690f631fc14db44467e7 (patch) | |
| tree | 1db4d210a7419286b447dc09fa7400a561d55f42 /arch/x86/include/asm/livepatch.h | |
| parent | ARM: OMAP2+: Remove unnessary return statement from the void function, omap2_... (diff) | |
| parent | ARM: dts: am4372.dtsi: disable rfbi (diff) | |
| download | linux-ae745302c0a3e2b5b768690f631fc14db44467e7.tar.xz linux-ae745302c0a3e2b5b768690f631fc14db44467e7.zip | |
Merge branch 'fixes-rc1' into omap-for-v4.2/fixes
Diffstat (limited to 'arch/x86/include/asm/livepatch.h')
| -rw-r--r-- | arch/x86/include/asm/livepatch.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/livepatch.h b/arch/x86/include/asm/livepatch.h index 2d29197bd2fb..19c099afa861 100644 --- a/arch/x86/include/asm/livepatch.h +++ b/arch/x86/include/asm/livepatch.h @@ -21,6 +21,7 @@ #ifndef _ASM_X86_LIVEPATCH_H #define _ASM_X86_LIVEPATCH_H +#include <asm/setup.h> #include <linux/module.h> #include <linux/ftrace.h> |