diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-12-21 11:59:55 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-21 11:59:55 +0900 |
commit | 76e7461a21dfe13565b2a323b53c8cc963541126 (patch) | |
tree | 8e399c71b38bb80c00d8a82310021b55ab6e8e33 /include/linux/mmzone.h | |
parent | d0b873fc73b793277c8a0824ce986b5bfeaef157 (diff) | |
parent | dd59f6c76b265ed2ff18b497d6105a9511b1feb1 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 6f7561730d8..30fe668c254 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> |