ARM: OMAP: Fixed merge conflict in board.h before syncing with mainline

Fixed merge conflict in board.h before syncing with mainline

diff --git a/include/asm-arm/arch-omap/board.h b/include/asm-arm/arch-omap/board.h
index cdaa161b7d55298af76d9f617eb0fd2cd16c3623..a0040cd86639452426f7a715e5f9043237fdc5ed 100644 (file)
--- a/include/asm-arm/arch-omap/board.h
+++ b/include/asm-arm/arch-omap/board.h
@@ -116,7 +116,7 @@ struct omap_boot_reason_config {
 
 struct omap_uart_config {
        /* Bit field of UARTs present; bit 0 --> UART1 */
-       unsigned int enabled_uarts; 
+       unsigned int enabled_uarts;
 };
 
 struct omap_board_config_entry {