2.6.13-mm3

[Jiri Slaby]

> I'm getting some build errors on ppc64 in drivers/char/hvc_console.c
> 
> 
>   CC      drivers/char/hvc_console.o
> drivers/char/hvc_console.c: In function `hvc_poll':
> drivers/char/hvc_console.c:600: error: `count' undeclared (first use in this
> function)
> drivers/char/hvc_console.c:600: error: (Each undeclared identifier is reported
> only once
> drivers/char/hvc_console.c:600: error: for each function it appears in.)
> drivers/char/hvc_console.c:636: error: structure has no member named `flip'
> make[1]: *** [drivers/char/hvc_console.o] Error 1
> make: *** [_module_drivers/char] Error 2
> 
> The count undeclared one was easy to fix but I coldn't fix the filp
> structure element in 2-3 minutes so I'm punting.
> 
> Anyone have a patch to fix this driver?

Try this:
---

 hvc_console.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -566,7 +566,7 @@ static int hvc_chars_in_buffer(struct tt
 static int hvc_poll(struct hvc_struct *hp)
 {
 	struct tty_struct *tty;
-	int i, n, poll_mask = 0;
+	int i, n, count, poll_mask = 0;
 	char buf[N_INBUF] __ALIGNED__;
 	unsigned long flags;
 	int read_total = 0;
@@ -633,7 +633,7 @@ static int hvc_poll(struct hvc_struct *h
 			tty_insert_flip_char(tty, buf[i], 0);
 		}
 
-		if (tty->flip.count)
+		if (tty->buf->tail->count)
 			tty_schedule_flip(tty);
 
 		/*