Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[~andy/linux] / drivers / staging / keucr / common.h

diff --git a/drivers/staging/keucr/common.h b/drivers/staging/keucr/common.h
index f40c64f4e0caef497762f4b11941da0e9e96eb8d..8693c54f76d06200fe909953b8ac7342d778122c 100644 (file)
--- a/drivers/staging/keucr/common.h
+++ b/drivers/staging/keucr/common.h
@@ -1,23 +1,24 @@
 #ifndef COMMON_INCD
 #define COMMON_INCD
 
-typedef void            VOID;
-typedef u8              BOOLEAN;
-typedef u8              BYTE;
-typedef u8              *PBYTE;
-typedef u16             WORD;
-typedef u16             *PWORD;
-typedef u32             DWORD;
-typedef u32             *PDWORD;
+typedef void VOID;
+typedef u8 BOOLEAN;
+typedef u8 BYTE;
+typedef u8 *PBYTE;
+typedef u16 WORD;
+typedef u16 *PWORD;
+typedef u32 DWORD;
+typedef u32 *PDWORD;
 
-#define swapWORD(w)            ((((unsigned short)(w) << 8) & 0xff00) | (((unsigned short)(w) >> 8) & 0x00ff))
-#define swapDWORD(dw)          ((((unsigned long)(dw) << 24) & 0xff000000) |    \
-                                       (((unsigned long)(dw) <<  8) & 0x00ff0000) |    \
-                                       (((unsigned long)(dw) >>  8) & 0x0000ff00) |    \
-                                       (((unsigned long)(dw) >> 24) & 0x000000ff))
+#define swapWORD(w)    ((((unsigned short)(w) << 8) & 0xff00) |        \
+                        (((unsigned short)(w) >> 8) & 0x00ff))
+#define swapDWORD(dw)  ((((unsigned long)(dw) << 24) & 0xff000000) |   \
+                        (((unsigned long)(dw) <<  8) & 0x00ff0000) |   \
+                        (((unsigned long)(dw) >>  8) & 0x0000ff00) |   \
+                        (((unsigned long)(dw) >> 24) & 0x000000ff))
 
-#define LittleEndianWORD(w)             (w)
-#define LittleEndianDWORD(dw)           (dw)
+#define LittleEndianWORD(w)    (w)
+#define LittleEndianDWORD(dw)  (dw)
 #define BigEndianWORD(w)       swapWORD(w)
 #define BigEndianDWORD(dw)     swapDWORD(dw)