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

Fixed merge conflict in board.h before syncing with mainline

ARM: OMAP: Fixed merge conflict in board.h before syncing with mainline
Fixed merge conflict in board.h before syncing with mainline
3856bce7 · Tony Lindgren · ede85083 · 3856bce7
Commit 3856bce7 authored Jul 28, 2005 by Tony Lindgren
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/asm-arm/arch-omap/board.h include/asm-arm/arch-omap/board.h +1 -1

No files found.
--- a/include/asm-arm/arch-omap/board.h
+++ b/include/asm-arm/arch-omap/board.h