Merge branch 'pxa-devel' into pxa

[linux-2.6] / include / asm-arm / arch-at91 / at91sam9260_matrix.h

diff --git a/include/asm-arm/arch-at91/at91sam9260_matrix.h b/include/asm-arm/arch-at91/at91sam9260_matrix.h
index aacb1e9764220d484be05a0db74a3251d0ad1f76..a8e9fec6c7352ad5ff7441d3f0aa315df42ae689 100644 (file)
--- a/include/asm-arm/arch-at91/at91sam9260_matrix.h
+++ b/include/asm-arm/arch-at91/at91sam9260_matrix.h
@@ -67,7 +67,7 @@
 #define                AT91_MATRIX_CS4A                (1 << 4)        /* Chip Select 4 Assignment */
 #define                        AT91_MATRIX_CS4A_SMC            (0 << 4)
 #define                        AT91_MATRIX_CS4A_SMC_CF1        (1 << 4)
-#define                AT91_MATRIX_CS5A                (1 << 5 )       /* Chip Select 5 Assignment */
+#define                AT91_MATRIX_CS5A                (1 << 5)        /* Chip Select 5 Assignment */
 #define                        AT91_MATRIX_CS5A_SMC            (0 << 5)
 #define                        AT91_MATRIX_CS5A_SMC_CF2        (1 << 5)
 #define                AT91_MATRIX_DBPUC               (1 << 8)        /* Data Bus Pull-up Configuration */