diff options
| author | Tom Rini <trini@ti.com> | 2014-11-24 12:00:00 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-24 12:00:00 -0500 |
| commit | 746667f1e56bf08d03e66a178df3c4f4f6c806e1 (patch) | |
| tree | e42c7fd72cb1ef97a5a05a73b06b3cd2fc118147 /arch/x86/cpu/coreboot/tables.c | |
| parent | 6c016485a685b5cdac28edb25147311a3e88d51f (diff) | |
| parent | fe5b9b447c6eea3873833b1f3ba15c9854aa2ef8 (diff) | |
Merge git://git.denx.de/u-boot-x86
Conflicts:
arch/x86/cpu/Makefile
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/x86/cpu/coreboot/tables.c')
| -rw-r--r-- | arch/x86/cpu/coreboot/tables.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/cpu/coreboot/tables.c b/arch/x86/cpu/coreboot/tables.c index 0d91adc5e47..92b75286b18 100644 --- a/arch/x86/cpu/coreboot/tables.c +++ b/arch/x86/cpu/coreboot/tables.c @@ -8,9 +8,9 @@ */ #include <common.h> -#include <asm/arch-coreboot/ipchecksum.h> -#include <asm/arch-coreboot/sysinfo.h> -#include <asm/arch-coreboot/tables.h> +#include <asm/arch/ipchecksum.h> +#include <asm/arch/sysinfo.h> +#include <asm/arch/tables.h> /* * This needs to be in the .data section so that it's copied over during |