From ba14c22b618c53eec2722540bc1b935bf1bdeddc Mon Sep 17 00:00:00 2001
From: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Date: Sat, 2 Aug 2008 21:23:36 +0200
Subject: [PATCH] --- yaml --- r: 110351 b: refs/heads/master c:
 020878ac427aa053414602cef975c2b5a2e33bf8 h: refs/heads/master i:   110349:
 5902f550bad70c85507d7937d5155a337e5a4742   110347:
 00fecfe4dc9431a20989b5204dd5a65bdaac295b   110343:
 bb2bccceb00f663596d91c661b4c94fbe7deccca   110335:
 8002d46aea44625457ad99b10e73d9853b5852eb v: v3

---
 [refs]                                |  2 +-
 trunk/arch/x86/boot/compressed/misc.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f5e452096612..9ff645147bd8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bd455dbfebfd632a8dcf1d3d1612737986fde0a
+refs/heads/master: 020878ac427aa053414602cef975c2b5a2e33bf8
diff --git a/trunk/arch/x86/boot/compressed/misc.c b/trunk/arch/x86/boot/compressed/misc.c
index 9fea73706479..2a3f77e52e2d 100644
--- a/trunk/arch/x86/boot/compressed/misc.c
+++ b/trunk/arch/x86/boot/compressed/misc.c
@@ -27,7 +27,7 @@
 #include <linux/linkage.h>
 #include <linux/screen_info.h>
 #include <linux/elf.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/page.h>
 #include <asm/boot.h>
 #include <asm/bootparam.h>
@@ -251,7 +251,7 @@ static void __putstr(int error, const char *s)
 				y--;
 			}
 		} else {
-			vidmem [(x + cols * y) * 2] = c;
+			vidmem[(x + cols * y) * 2] = c;
 			if (++x >= cols) {
 				x = 0;
 				if (++y >= lines) {
@@ -277,7 +277,8 @@ static void *memset(void *s, int c, unsigned n)
 	int i;
 	char *ss = s;
 
-	for (i = 0; i < n; i++) ss[i] = c;
+	for (i = 0; i < n; i++)
+		ss[i] = c;
 	return s;
 }
 
@@ -287,7 +288,8 @@ static void *memcpy(void *dest, const void *src, unsigned n)
 	const char *s = src;
 	char *d = dest;
 
-	for (i = 0; i < n; i++) d[i] = s[i];
+	for (i = 0; i < n; i++)
+		d[i] = s[i];
 	return dest;
 }