From 1e424882e0635c3f2da968120f9df0f627f85658 Mon Sep 17 00:00:00 2001
From: Nick Rosencrantz <nik@kth.se>
Date: Wed, 5 Apr 2017 02:29:03 +0200
Subject: [PATCH 1/2] Enabled the build of nios2 which previously was failing
 with undefined reference to screen_info

---
 arch/nios2/kernel/setup.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c
index a4ff86d58d5cd..7f744d3ba0000 100644
--- a/arch/nios2/kernel/setup.c
+++ b/arch/nios2/kernel/setup.c
@@ -7,7 +7,7 @@
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file "COPYING" in the main directory of this archive
- * for more details.
+ * for more details.!
  */
 
 #include <linux/export.h>
@@ -18,6 +18,7 @@
 #include <linux/bootmem.h>
 #include <linux/initrd.h>
 #include <linux/of_fdt.h>
+#include <linux/screen_info.h>
 
 #include <asm/mmu_context.h>
 #include <asm/sections.h>
@@ -36,6 +37,10 @@ static struct pt_regs fake_regs = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 					0, 0, 0, 0, 0, 0,
 					0};
 
+#if defined(CONFIG_VT)
+struct screen_info screen_info;
+#endif
+
 /* Copy a short hook instruction sequence to the exception address */
 static inline void copy_exception_handler(unsigned int addr)
 {

From 566be53df89df8ed737d914da67b9655e71b7069 Mon Sep 17 00:00:00 2001
From: Niklas Rosencrantz <niklas@montao.com.br>
Date: Thu, 6 Apr 2017 14:12:20 +0200
Subject: [PATCH 2/2] Update setup.c

---
 arch/nios2/kernel/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c
index 7f744d3ba0000..6ca6ce632f457 100644
--- a/arch/nios2/kernel/setup.c
+++ b/arch/nios2/kernel/setup.c
@@ -7,7 +7,7 @@
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License. See the file "COPYING" in the main directory of this archive
- * for more details.!
+ * for more details.
  */
 
 #include <linux/export.h>