Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/sh/kernel/process_32.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

2 files changed, 10 insertions, 8 deletions

diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index 659a695bdad6..2af8fd113123 100644
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
@@ -14,11 +14,10 @@
 #include <linux/slab.h>
 #include <linux/serial_core.h>
 #include <linux/serial_8250.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/nwpserial.h>
 
-#include <asm/prom.h>
-
 struct of_serial_info {
         int type;
         int line;
diff --git a/drivers/serial/suncore.c b/drivers/serial/suncore.c
index 544f2e25d0e5..6381a0282ee7 100644
--- a/drivers/serial/suncore.c
+++ b/drivers/serial/suncore.c
@@ -55,7 +55,12 @@ EXPORT_SYMBOL(sunserial_unregister_minors);
 int sunserial_console_match(struct console *con, struct device_node *dp,
                             struct uart_driver *drv, int line, bool ignore_line)
 {
-        if (!con || of_console_device != dp)
+        if (!con)
+                return 0;
+
+        drv->cons = con;
+
+        if (of_console_device != dp)
                 return 0;
 
         if (!ignore_line) {
@@ -69,12 +74,10 @@ int sunserial_console_match(struct console *con, struct device_node *dp,
                         return 0;
         }
 
-        con->index = line;
-        drv->cons = con;
-
-        if (!console_set_on_cmdline)
+        if (!console_set_on_cmdline) {
+                con->index = line;
                 add_preferred_console(con->name, line, NULL);
-
+        }
         return 1;
 }
 EXPORT_SYMBOL(sunserial_console_match);