diff --git a/[refs] b/[refs]
index 217e0b0593ac..5ad4236e461f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f28169d2000177e8b72ccc6d72887be779dceca8
+refs/heads/master: 894be2a485b75bce9a4d45d3e431aafd4c89f1ea
diff --git a/trunk/arch/um/drivers/stdio_console.c b/trunk/arch/um/drivers/stdio_console.c
index 3cbfe3a88607..0b1bca498049 100644
--- a/trunk/arch/um/drivers/stdio_console.c
+++ b/trunk/arch/um/drivers/stdio_console.c
@@ -30,8 +30,6 @@
 
 #define MAX_TTYS (16)
 
-/* ----------------------------------------------------------------------------- */
-
 /* Referenced only by tty_driver below - presumably it's locked correctly
  * by the tty driver.
  */
diff --git a/trunk/arch/um/include/mconsole_kern.h b/trunk/arch/um/include/mconsole_kern.h
index 73030e52b2ce..d2fe07e78958 100644
--- a/trunk/arch/um/include/mconsole_kern.h
+++ b/trunk/arch/um/include/mconsole_kern.h
@@ -20,7 +20,7 @@ struct mc_device {
 	char *name;
 	int (*config)(char *, char **);
 	int (*get_config)(char *, char *, int, char **);
-        int (*id)(char **, int *, int *);
+	int (*id)(char **, int *, int *);
 	int (*remove)(int, char **);
 };