From: Tony Lindgren <tony@atomide.com>
Date: Thu, 28 Jul 2005 09:04:00 +0000 (-0700)
Subject: ARM: OMAP: Fixed merge conflict in board.h before syncing with mainline
X-Git-Tag: v2.6.13-omap1~45
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3856bce7f6699f3a9749124cfb07f9c907c33e9f;p=linux-2.6-omap-h63xx.git

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 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 {