diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-12-07 22:47:17 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-12-07 22:47:17 +0100 |
| commit | 206c00f26f56af02686cb69bfe5c75e979063171 (patch) | |
| tree | 4e637df34f87762a2e70649e88f52ac973df1f00 /cpu/arm920t/s3c24x0/timer.c | |
| parent | 39ff7d5f4cc547a2034a8bfc2a5b5f4b62fd5c20 (diff) | |
| parent | f8450829f921cf10667af98a8d08edfa3d998f04 (diff) | |
Merge branch 'master' into next
Conflicts:
lib_generic/zlib.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'cpu/arm920t/s3c24x0/timer.c')
| -rw-r--r-- | cpu/arm920t/s3c24x0/timer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpu/arm920t/s3c24x0/timer.c b/cpu/arm920t/s3c24x0/timer.c index fcc6c0cb1..7d4735438 100644 --- a/cpu/arm920t/s3c24x0/timer.c +++ b/cpu/arm920t/s3c24x0/timer.c @@ -198,6 +198,8 @@ void reset_cpu(ulong ignored) struct s3c24x0_watchdog *watchdog; #ifdef CONFIG_TRAB + extern void disable_vfd(void); + disable_vfd(); #endif |