Merge tag v3.9-rc1 into for-3.9/upstream-fixes

[cascardo/linux.git] / arch / mips / include / asm / mach-rc32434 / timer.h

diff --git a/arch/mips/include/asm/mach-rc32434/timer.h b/arch/mips/include/asm/mach-rc32434/timer.h
index e49b1d5..cda26bb 100644 (file)
--- a/arch/mips/include/asm/mach-rc32434/timer.h
+++ b/arch/mips/include/asm/mach-rc32434/timer.h
@@ -51,15 +51,15 @@ struct timer {
 #define RC32434_CTC_TO_BIT             1
 
 /* Real time clock registers */
-#define RC32434_RTC_MSK(x)              BIT_TO_MASK(x)
-#define RC32434_RTC_CE_BIT              0
-#define RC32434_RTC_TO_BIT              1
-#define RC32434_RTC_RQE_BIT             2
+#define RC32434_RTC_MSK(x)             BIT_TO_MASK(x)
+#define RC32434_RTC_CE_BIT             0
+#define RC32434_RTC_TO_BIT             1
+#define RC32434_RTC_RQE_BIT            2
 
 /* Counter registers */
-#define RC32434_RCOUNT_BIT              0
-#define RC32434_RCOUNT_MSK              0x0000ffff
-#define RC32434_RCOMP_BIT               0
-#define RC32434_RCOMP_MSK               0x0000ffff
+#define RC32434_RCOUNT_BIT             0
+#define RC32434_RCOUNT_MSK             0x0000ffff
+#define RC32434_RCOMP_BIT              0
+#define RC32434_RCOMP_MSK              0x0000ffff
 
-#endif  /* __ASM_RC32434_TIMER_H */
+#endif /* __ASM_RC32434_TIMER_H */