From 3856bce7f6699f3a9749124cfb07f9c907c33e9f Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 28 Jul 2005 02:04:00 -0700 Subject: [PATCH] ARM: OMAP: Fixed merge conflict in board.h before syncing with mainline Fixed merge conflict in board.h before syncing with mainline --- include/asm-arm/arch-omap/board.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/asm-arm/arch-omap/board.h b/include/asm-arm/arch-omap/board.h index cdaa161b7d5..a0040cd8663 100644 --- 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 { -- 2.41.1