From e751f38eb9921d18b905364c5915b9ee57240cf5 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Sun, 31 Jul 2011 18:38:45 -0400
Subject: [PATCH] --- yaml --- r: 274415 b: refs/heads/master c:
 9e54d33fbfc6ef120b86ab1e6181763ecc44eb98 h: refs/heads/master i:   274413:
 c58119e61e109c9a23d749c7d750d9b272ee561f   274411:
 e147d96b9ab195865e98bcdc13950aabb1766fe4   274407:
 3755f431a255218c7d7cc6aff65a9c740c0fa4a4   274399:
 94570cf53bb927d965c1dc752b8a0fe1bd29f19c v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-bcmring/mm.c        | 1 +
 trunk/arch/arm/mach-sa1100/collie.c     | 1 +
 trunk/arch/arm/mach-sa1100/jornada720.c | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 21fc725ffb5b..f9bceb954da1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d44b28c49e7ab3baf280100ab86d8e7ef9204e45
+refs/heads/master: 9e54d33fbfc6ef120b86ab1e6181763ecc44eb98
diff --git a/trunk/arch/arm/mach-bcmring/mm.c b/trunk/arch/arm/mach-bcmring/mm.c
index 8616876abb9f..1adec78ec940 100644
--- a/trunk/arch/arm/mach-bcmring/mm.c
+++ b/trunk/arch/arm/mach-bcmring/mm.c
@@ -14,6 +14,7 @@
 
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <asm/page.h>
 #include <asm/mach/map.h>
 
 #include <mach/hardware.h>
diff --git a/trunk/arch/arm/mach-sa1100/collie.c b/trunk/arch/arm/mach-sa1100/collie.c
index bd3e1bfdd6aa..2965cc9d424e 100644
--- a/trunk/arch/arm/mach-sa1100/collie.c
+++ b/trunk/arch/arm/mach-sa1100/collie.c
@@ -31,6 +31,7 @@
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
+#include <asm/page.h>
 #include <asm/setup.h>
 #include <mach/collie.h>
 
diff --git a/trunk/arch/arm/mach-sa1100/jornada720.c b/trunk/arch/arm/mach-sa1100/jornada720.c
index 0bb520d48ed0..77198fe02bc5 100644
--- a/trunk/arch/arm/mach-sa1100/jornada720.c
+++ b/trunk/arch/arm/mach-sa1100/jornada720.c
@@ -26,6 +26,7 @@
 #include <mach/hardware.h>
 #include <asm/hardware/sa1111.h>
 #include <asm/irq.h>
+#include <asm/page.h>
 #include <asm/mach-types.h>
 #include <asm/setup.h>
 #include <asm/mach/arch.h>