diff options
author | H. Peter Anvin <hpa@zytor.com> | 2010-02-11 00:55:28 (GMT) |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-11 00:55:28 (GMT) |
commit | 84abd88a70090cf00f9e45c3a81680874f17626e (patch) | |
tree | 4f58b80057f6e1f5817af1dc33a5458b3dfc9a99 /include/linux/mmzone.h | |
parent | 13ca0fcaa33f6b1984c4111b6ec5df42689fea6f (diff) | |
parent | e28cab42f384745c8a947a9ccd51e4aae52f5d51 (diff) | |
download | linux-fsl-qoriq-84abd88a70090cf00f9e45c3a81680874f17626e.tar.xz |
Merge remote branch 'linus/master' into x86/bootmem
Diffstat (limited to 'include/linux/mmzone.h')
-rw-r--r-- | include/linux/mmzone.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 6f75617..30fe668 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -15,7 +15,7 @@ #include <linux/seqlock.h> #include <linux/nodemask.h> #include <linux/pageblock-flags.h> -#include <linux/bounds.h> +#include <generated/bounds.h> #include <asm/atomic.h> #include <asm/page.h> |