From 281089245df7ad047983170db69edc4eead668cc Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Fri, 1 Feb 2013 13:00:38 -0500
Subject: [PATCH] --- yaml --- r: 349713 b: refs/heads/master c:
 a05d3f9fa3b496b2894c73bb8cbb49deb09b41db h: refs/heads/master i:   349711:
 d34d2bb18839c8598359f65530514a110cb2841e v: v3

---
 [refs]                         | 2 +-
 trunk/arch/tile/kernel/setup.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 523ba92ea307..d51bc056beca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84e4e46020cdb0e091858eb8263a2287880e2bad
+refs/heads/master: a05d3f9fa3b496b2894c73bb8cbb49deb09b41db
diff --git a/trunk/arch/tile/kernel/setup.c b/trunk/arch/tile/kernel/setup.c
index 6a649a4462d3..d1e15f7b59c6 100644
--- a/trunk/arch/tile/kernel/setup.c
+++ b/trunk/arch/tile/kernel/setup.c
@@ -31,6 +31,7 @@
 #include <linux/timex.h>
 #include <linux/hugetlb.h>
 #include <linux/start_kernel.h>
+#include <linux/screen_info.h>
 #include <asm/setup.h>
 #include <asm/sections.h>
 #include <asm/cacheflush.h>
@@ -49,6 +50,10 @@ static inline int ABS(int x) { return x >= 0 ? x : -x; }
 /* Chip information */
 char chip_model[64] __write_once;
 
+#ifdef CONFIG_VT
+struct screen_info screen_info;
+#endif
+
 struct pglist_data node_data[MAX_NUMNODES] __read_mostly;
 EXPORT_SYMBOL(node_data);