From 51898a072346e7628abda6f6605bf10e8feaf5cb Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Mar 2009 22:03:22 +1100
Subject: [PATCH] --- yaml --- r: 140567 b: refs/heads/master c:
 17ad6ea621b1c7952ebd7330ce65de26b6ee9cca h: refs/heads/master i:   140565:
 cfb5a869f447a56fe315cdfe2af0b1a28e3010fc   140563:
 d2f9657b4af576317563a1f02485b0dfd8c0fdf9   140559:
 bbddc4d24682489b9b7f6f63f6fe4124ccafb902 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/powerpc/include/asm/mmzone.h | 1 +
 trunk/arch/sparc/include/asm/mmzone.h   | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b18c263cc29e..ca2a73201112 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df7c8e845e8e2030e8ae947e0ace56d184d0e9a0
+refs/heads/master: 17ad6ea621b1c7952ebd7330ce65de26b6ee9cca
diff --git a/trunk/arch/powerpc/include/asm/mmzone.h b/trunk/arch/powerpc/include/asm/mmzone.h
index 19f299b7e256..35acac90c8ca 100644
--- a/trunk/arch/powerpc/include/asm/mmzone.h
+++ b/trunk/arch/powerpc/include/asm/mmzone.h
@@ -8,6 +8,7 @@
 #define _ASM_MMZONE_H_
 #ifdef __KERNEL__
 
+#include <linux/cpumask.h>
 
 /*
  * generic non-linear memory support:
diff --git a/trunk/arch/sparc/include/asm/mmzone.h b/trunk/arch/sparc/include/asm/mmzone.h
index ebf5986c12ed..e8c648741ed4 100644
--- a/trunk/arch/sparc/include/asm/mmzone.h
+++ b/trunk/arch/sparc/include/asm/mmzone.h
@@ -3,6 +3,8 @@
 
 #ifdef CONFIG_NEED_MULTIPLE_NODES
 
+#include <linux/cpumask.h>
+
 extern struct pglist_data *node_data[];
 
 #define NODE_DATA(nid)		(node_data[nid])