From: Tom Rini Date: Sun, 18 Aug 2013 18:14:34 +0000 (-0400) Subject: Merge branch 'master' of git://88.191.163.10/u-boot-arm X-Git-Tag: v2013.10-rc1~22 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e20cc2ca15b5b0644f51b6e58d530d70acd2bc00;p=oweals%2Fu-boot.git Merge branch 'master' of git://88.191.163.10/u-boot-arm 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 --- e20cc2ca15b5b0644f51b6e58d530d70acd2bc00 diff --cc arch/arm/include/asm/arch-am33xx/hardware.h index 2dfcc2e65b,2055b25494..ee5fce0da1 --- a/arch/arm/include/asm/arch-am33xx/hardware.h +++ b/arch/arm/include/asm/arch-am33xx/hardware.h @@@ -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 */