From ff6249b719a3eaa1bbc798d87650feb3729e73ba Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Mon, 27 Feb 2012 18:08:25 -0500
Subject: [PATCH] --- yaml --- r: 295295 b: refs/heads/master c:
 15839b4774c618117122074c630a49983f515318 h: refs/heads/master i:   295293:
 12ae72ec9ea789b4864d564b89401ae553b52561   295291:
 c8c8a2bd780359cad50452917891d8684cf733d8   295287:
 eb6d7f6f130d38a358bdcc9cba82259b9e1b561f   295279:
 94795b6accf80c51ada50547650513ee6f1834f6   295263:
 7f3f4517336755f41cecf000ff802a08276a1ab5   295231:
 47df4a30286b2b02c3399aa6f420111cfa6e8f3a   295167:
 d89f356f609853bd36b458030db77ae7bf67cc5b v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/ia64/sn/kernel/io_common.c     | 1 +
 trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 661c6b430402..a26308333472 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 454ca6040acc441221d1b07c38c6127947a223d0
+refs/heads/master: 15839b4774c618117122074c630a49983f515318
diff --git a/trunk/arch/ia64/sn/kernel/io_common.c b/trunk/arch/ia64/sn/kernel/io_common.c
index 4433dd019d3c..fbb5f2f87eed 100644
--- a/trunk/arch/ia64/sn/kernel/io_common.c
+++ b/trunk/arch/ia64/sn/kernel/io_common.c
@@ -7,6 +7,7 @@
  */
 
 #include <linux/bootmem.h>
+#include <linux/export.h>
 #include <linux/slab.h>
 #include <asm/sn/types.h>
 #include <asm/sn/addrs.h>
diff --git a/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 2de41d44266e..4554f68b7865 100644
--- a/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -25,6 +25,7 @@
 
 #include <linux/fs.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 #include <linux/vmalloc.h>
 #include <linux/seq_file.h>
 #include <linux/miscdevice.h>