From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 31 Jan 2011 22:05:19 +0000 (+1000)
Subject: Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v2.6.38-rc3~9
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=abfa44b5fd4a2f5d7549005bec465d4823a263ff;p=linux-2.6-block.git

Merge branch 'tty-linus' of git://git./linux/kernel/git/gregkh/tty-2.6

* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  tty/serial: fix apbuart build
  n_hdlc: fix read and write locking
  serial: unbreak billionton CF card
  tty: use for_each_console() and WARN() on sysfs failures
  vt: fix issue when fbcon wants to takeover a second time.

Fix up trivial conflict in drivers/tty/tty_io.c
---

abfa44b5fd4a2f5d7549005bec465d4823a263ff
diff --cc drivers/tty/tty_io.c
index 6158eae0f64a,dae6fc96182c..0065da4b11c1
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@@ -3256,8 -3256,8 +3256,8 @@@ static ssize_t show_cons_active(struct 
  	struct console *c;
  	ssize_t count = 0;
  
 -	acquire_console_sem();
 +	console_lock();
- 	for (c = console_drivers; c; c = c->next) {
+ 	for_each_console(c) {
  		if (!c->device)
  			continue;
  		if (!c->write)