Fix mach-omap2/serial.c merge to remove OMAP_TAG_UART
authorTony Lindgren <tony@atomide.com>
Sun, 16 Aug 2009 16:39:46 +0000 (19:39 +0300)
committerTony Lindgren <tony@atomide.com>
Sun, 16 Aug 2009 16:39:46 +0000 (19:39 +0300)
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>

No differences found