Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

* '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

diff --cc drivers/tty/tty_io.c
index 6158eae0f64a2e669f6c0d3887e7bc64163419ad,dae6fc96182cdab346abafd74a4e63e3aee55ecf..0065da4b11c1a89eefba4d6c3ac17abb25c9a41d
--- 1/drivers/tty/tty_io.c
--- 2/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)

diff --cc drivers/tty/vt/vt.c
Simple merge