From: Tony Lindgren <tony@atomide.com>
Date: Sun, 16 Aug 2009 16:39:46 +0000 (+0300)
Subject: Fix mach-omap2/serial.c merge to remove OMAP_TAG_UART
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~16^2^2~8^2^2~7^2~32
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6f4fc8418075d2a74d6edceec67627cd8a2f3a3;p=pandora-kernel.git

Fix mach-omap2/serial.c merge to remove OMAP_TAG_UART

Kalle's patch 7e9ccf7776bb68b5367eb0bb35e519df62bea35c gets
rid of the non-standard OMAP_TAG_UART. Earlier merge only
accounted for the conflicts between IO_ADDRESS and
OMAP2_IO_ADDRESS.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

Reading git-diff-tree failed