Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

[linux-2.6-omap-h63xx.git] / arch / mips / sibyte / cfe / console.c

diff --git a/arch/mips/sibyte/cfe/console.c b/arch/mips/sibyte/cfe/console.c
index 4cec9d798d2fefc28d2245798a0018c4b2aebdc8..81e3d54376e920d3e6b73aa23c71a7bb614dd7d7 100644 (file)
--- a/arch/mips/sibyte/cfe/console.c
+++ b/arch/mips/sibyte/cfe/console.c
@@ -4,8 +4,8 @@
 
 #include <asm/sibyte/board.h>
 
-#include "cfe_api.h"
-#include "cfe_error.h"
+#include <asm/fw/cfe/cfe_api.h>
+#include <asm/fw/cfe/cfe_error.h>
 
 extern int cfe_cons_handle;
 
@@ -14,7 +14,7 @@ static void cfe_console_write(struct console *cons, const char *str,
 {
        int i, last, written;
 
-       for (i=0,last=0; i<count; i++) {
+       for (i=0, last=0; i<count; i++) {
                if (!str[i])
                        /* XXXKW can/should this ever happen? */
                        return;