From c1989e9e350326ada2bfe7e62c4843bdf15409f5 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Tue, 27 Sep 2011 05:04:39 +0000
Subject: [PATCH] [powerpc/powerpc64] Add missing #include to LPAR console
 selection fix

svn path=/dists/trunk/linux-2.6/; revision=18134
---
 debian/changelog                                 |  7 +++++++
 debian/patches/bugfix/powerpc/lpar-console.patch | 12 +++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3784753d2..da309e114 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@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
diff --git a/debian/patches/bugfix/powerpc/lpar-console.patch b/debian/patches/bugfix/powerpc/lpar-console.patch
index b55565131..fdfc7db0b 100644
--- a/debian/patches/bugfix/powerpc/lpar-console.patch
+++ b/debian/patches/bugfix/powerpc/lpar-console.patch
@@ -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