Fix merge error.

Signed-off-by: Dirk Behme dirk.behme@googlemail.com

---

Jean-Christophe: Regarding

http://lists.denx.de/pipermail/u-boot/2008-November/043711.html

this is the only issue I can find in omap3.h. It doesn't seem to me that you removed anything (??)

Current u-boot-arm/omap3 head (b8220c34487428dc523433f79c7d9df5cd20921e) with this patch boot tested at BeagleBoard.

include/asm-arm/arch-omap3/omap3.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-)

Index: u-boot-arm/include/asm-arm/arch-omap3/omap3.h =================================================================== --- u-boot-arm.orig/include/asm-arm/arch-omap3/omap3.h +++ u-boot-arm/include/asm-arm/arch-omap3/omap3.h @@ -77,7 +77,7 @@ #define SYNC_32KTIMER_BASE 0x48320000 #define S32K_CR (SYNC_32KTIMER_BASE + 0x10)

-+/* OMAP3 GPIO registers */ +/* OMAP3 GPIO registers */ #define OMAP34XX_GPIO1_BASE 0x48310000 #define OMAP34XX_GPIO2_BASE 0x49050000 #define OMAP34XX_GPIO3_BASE 0x49052000