From 3c3da765a181f0a79bb5a9e44f4dc0303941f334 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 12 Sep 2008 22:41:30 +0900
Subject: [PATCH] --- yaml --- r: 116125 b: refs/heads/master c:
 6bff1592d85c9fa1f1d9d4de1cd0e104279544a6 h: refs/heads/master i:   116123:
 4d368a8d5973807d7732bcf1d83e23e102d920e1 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/sh/include/asm/mmzone.h | 2 ++
 trunk/arch/sh/include/asm/setup.h  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c5acd96ac5e0..6087c79e9043 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3231739d97b348c628a10fb49adfa9143e1de28b
+refs/heads/master: 6bff1592d85c9fa1f1d9d4de1cd0e104279544a6
diff --git a/trunk/arch/sh/include/asm/mmzone.h b/trunk/arch/sh/include/asm/mmzone.h
index 2969253c4042..7f5363b29ba0 100644
--- a/trunk/arch/sh/include/asm/mmzone.h
+++ b/trunk/arch/sh/include/asm/mmzone.h
@@ -4,6 +4,8 @@
 #ifdef __KERNEL__
 
 #ifdef CONFIG_NEED_MULTIPLE_NODES
+#include <linux/numa.h>
+
 extern struct pglist_data *node_data[];
 #define NODE_DATA(nid)		(node_data[nid])
 
diff --git a/trunk/arch/sh/include/asm/setup.h b/trunk/arch/sh/include/asm/setup.h
index 554f865075ca..1b7856f5924c 100644
--- a/trunk/arch/sh/include/asm/setup.h
+++ b/trunk/arch/sh/include/asm/setup.h
@@ -1,7 +1,7 @@
 #ifndef _SH_SETUP_H
 #define _SH_SETUP_H
 
-#include <asm/mmzone.h>
+#include <linux/mmzone.h>
 
 #define COMMAND_LINE_SIZE 256