dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-11-02 03:17:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/wd/git/u-boot/lwmon5

Browse Source 
Conflicts:

	common/cmd_bootm.c
	common/cmd_log.c
	include/common.h
	post/board/lwmon5/Makefile
	post/board/lwmon5/dsp.c
	post/board/lwmon5/dspic.c
	post/board/lwmon5/fpga.c
	post/board/lwmon5/gdc.c
	post/board/lwmon5/sysmon.c
	post/board/lwmon5/watchdog.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk
2008-04-25 11:32:01 +02:00
parent 926662762e a6e6fc610e
commit 4b7a6dd896
71 changed files with 153 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
post/drivers/rtc.c
View File

@@ -40,8 +40,6 @@
* nonleap-years.
*/
#ifdef CONFIG_POST
#include <post.h>
#include <rtc.h>
@@ -195,4 +193,3 @@ int rtc_post_test (int flags)
}
#endif /* CONFIG_POST & CFG_POST_RTC */
#endif /* CONFIG_POST */