Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / mips / lasat / picvue.c

diff --git a/arch/mips/lasat/picvue.c b/arch/mips/lasat/picvue.c
index d3d04c392e251f2d21a9ef6b5d5fb71ca7b784dd..7eb334892693db3fd5d5951f67fd23bd5552ed03 100644 (file)
--- a/arch/mips/lasat/picvue.c
+++ b/arch/mips/lasat/picvue.c
@@ -163,12 +163,12 @@ int pvc_program_cg(int charnum, u8 bitmap[BM_SIZE])
 }
 
 #define FUNC_SET_CMD   0x20
-#define  EIGHT_BYTE    (1 << 4)
-#define  FOUR_BYTE     0
-#define  TWO_LINES     (1 << 3)
-#define  ONE_LINE      0
-#define  LARGE_FONT    (1 << 2)
-#define  SMALL_FONT    0
+#define         EIGHT_BYTE     (1 << 4)
+#define         FOUR_BYTE      0
+#define         TWO_LINES      (1 << 3)
+#define         ONE_LINE       0
+#define         LARGE_FONT     (1 << 2)
+#define         SMALL_FONT     0
 
 static void pvc_funcset(u8 cmd)
 {
@@ -177,9 +177,9 @@ static void pvc_funcset(u8 cmd)
 }
 
 #define ENTRYMODE_CMD          0x4
-#define  AUTO_INC              (1 << 1)
-#define  AUTO_DEC              0
-#define  CURSOR_FOLLOWS_DISP   (1 << 0)
+#define         AUTO_INC               (1 << 1)
+#define         AUTO_DEC               0
+#define         CURSOR_FOLLOWS_DISP    (1 << 0)
 
 static void pvc_entrymode(u8 cmd)
 {
@@ -188,20 +188,20 @@ static void pvc_entrymode(u8 cmd)
 }
 
 #define DISP_CNT_CMD   0x08
-#define  DISP_OFF      0
-#define  DISP_ON       (1 << 2)
-#define  CUR_ON                (1 << 1)
-#define  CUR_BLINK     (1 << 0)
+#define         DISP_OFF       0
+#define         DISP_ON        (1 << 2)
+#define         CUR_ON         (1 << 1)
+#define         CUR_BLINK      (1 << 0)
 void pvc_dispcnt(u8 cmd)
 {
        pvc_write(DISP_CNT_CMD | (cmd & (DISP_ON|CUR_ON|CUR_BLINK)), MODE_INST);
 }
 
 #define MOVE_CMD       0x10
-#define  DISPLAY       (1 << 3)
-#define  CURSOR                0
-#define  RIGHT         (1 << 2)
-#define  LEFT          0
+#define         DISPLAY        (1 << 3)
+#define         CURSOR         0
+#define         RIGHT          (1 << 2)
+#define         LEFT           0
 void pvc_move(u8 cmd)
 {
        pvc_write(MOVE_CMD | (cmd & (DISPLAY|RIGHT)), MODE_INST);