diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-07-30 12:15:13 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-07-30 12:15:13 +0300 |
| commit | f5db340f19f14a8df9dfd22d71fba1513e9f1f7e (patch) | |
| tree | 131d3345bc987aee3c922624de816492e7f323a4 /include/linux/flat.h | |
| parent | ee438ec8f33c5af0d4a4ffb935c5b9272e8c2680 (diff) | |
| parent | 38115f2f8cec8087d558c062e779c443a01f87d6 (diff) | |
| download | linux-f5db340f19f14a8df9dfd22d71fba1513e9f1f7e.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up latest fixes and refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/flat.h')
| -rw-r--r-- | include/linux/flat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/flat.h b/include/linux/flat.h index 2c1eb15c4ba4..7d542dfd0def 100644 --- a/include/linux/flat.h +++ b/include/linux/flat.h @@ -9,8 +9,8 @@ #ifndef _LINUX_FLAT_H #define _LINUX_FLAT_H -#include <asm/flat.h> #include <uapi/linux/flat.h> +#include <asm/flat.h> /* * While it would be nice to keep this header clean, users of older |