[kernel] r18134 - in dists/trunk/linux-2.6/debian: . patches/bugfix/powerpc

[Ben Hutchings]

Author: benh
Date: Tue Sep 27 05:04:39 2011
New Revision: 18134

Log:
[powerpc/powerpc64] Add missing #include to LPAR console selection fix

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Sep 26 13:23:11 2011	(r18133)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Sep 27 05:04:39 2011	(r18134)
@@ -1,3 +1,10 @@
+linux-2.6 (3.1.0~rc7-1~experimental.2) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * [powerpc/powerpc64] Add missing #include to LPAR console selection fix
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 27 Sep 2011 06:02:56 +0100
+
 linux-2.6 (3.1.0~rc7-1~experimental.1) experimental; urgency=low
 
   * New upstream release candidate

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch	Mon Sep 26 13:23:11 2011	(r18133)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/lpar-console.patch	Tue Sep 27 05:04:39 2011	(r18134)
@@ -1,8 +1,14 @@
-diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
-index 130aace..028349a 100644
 --- a/drivers/tty/hvc/hvc_vio.c
 +++ b/drivers/tty/hvc/hvc_vio.c
-@@ -446,7 +446,9 @@ void __init hvc_vio_init_early(void)
+@@ -48,6 +48,7 @@
+ #include <asm/firmware.h>
+ #include <asm/hvsi.h>
+ #include <asm/udbg.h>
++#include <asm/machdep.h>
+ 
+ #include "hvc_console.h"
+ 
+@@ -446,7 +447,9 @@ void __init hvc_vio_init_early(void)
  	if (hvterm_priv0.proto == HV_PROTOCOL_HVSI)
  		goto out;
  #endif