diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-03 20:36:04 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-03 20:36:04 +0100 |
| commit | e84fb175f671d2dc9a0b2253ac28b85a2f3620cd (patch) | |
| tree | f4c11f508d0b6e2181595a887ccbb7dc004b976e /arch/x86/cpu/sc520/sc520_timer.c | |
| parent | b2b4449aa7fcbf2b3042cd9100f5857d89480812 (diff) | |
| parent | 4c1c355a68d102e900617639d702c35390564355 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
* 'master' of git://git.denx.de/u-boot-x86:
x86: Fix a compiler warning in arch/x86/lib/realmode.c
x86: Remove the prototype for the unused function board_init
x86: Rename include/asm/ic to include/asm/arch-sc520
x86: turn off cache: set control register properly
Diffstat (limited to 'arch/x86/cpu/sc520/sc520_timer.c')
| -rw-r--r-- | arch/x86/cpu/sc520/sc520_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/cpu/sc520/sc520_timer.c b/arch/x86/cpu/sc520/sc520_timer.c index 5cccda1f28..05bc9c1103 100644 --- a/arch/x86/cpu/sc520/sc520_timer.c +++ b/arch/x86/cpu/sc520/sc520_timer.c @@ -27,7 +27,7 @@ #include <common.h> #include <asm/io.h> #include <asm/interrupt.h> -#include <asm/ic/sc520.h> +#include <asm/arch/sc520.h> void sc520_timer_isr(void) { |