]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://88.191.163.10/u-boot-arm
authorTom Rini <trini@ti.com>
Sun, 18 Aug 2013 18:14:34 +0000 (14:14 -0400)
committerTom Rini <trini@ti.com>
Sun, 18 Aug 2013 18:14:34 +0000 (14:14 -0400)
Fixup an easy conflict over adding the clk_get prototype and USB_OTG
defines for am33xx having moved.

Conflicts:
arch/arm/include/asm/arch-am33xx/hardware.h

Signed-off-by: Tom Rini <trini@ti.com>
1  2 
.gitignore
MAINTAINERS
Makefile
README
arch/arm/include/asm/arch-am33xx/hardware.h
boards.cfg

diff --cc .gitignore
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc README
Simple merge
index 2dfcc2e65bef0297ecb0a402b421720dbc946fbe,2055b254948995da637dfe779d1ae39b50921237..ee5fce0da1caef5677d66d565c66d0b956beb61e
@@@ -74,9 -68,4 +68,5 @@@
  /* CPSW Config space */
  #define CPSW_BASE                     0x4A100000
  
- /* OTG */
- #define USB0_OTG_BASE                 0x47401000
- #define USB1_OTG_BASE                 0x47401800
 +int clk_get(int clk);
  #endif /* __AM33XX_HARDWARE_H */
diff --cc boards.cfg
Simple merge