summaryrefslogtreecommitdiff
path: root/arch/x86/cpu/sc520/sc520_pci.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-11-03 20:36:04 +0100
committerWolfgang Denk <wd@denx.de>2011-11-03 20:36:04 +0100
commite84fb175f671d2dc9a0b2253ac28b85a2f3620cd (patch)
treef4c11f508d0b6e2181595a887ccbb7dc004b976e /arch/x86/cpu/sc520/sc520_pci.c
parentb2b4449aa7fcbf2b3042cd9100f5857d89480812 (diff)
parent4c1c355a68d102e900617639d702c35390564355 (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_pci.c')
-rw-r--r--arch/x86/cpu/sc520/sc520_pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/cpu/sc520/sc520_pci.c b/arch/x86/cpu/sc520/sc520_pci.c
index 32d4802eba..e26793ab1b 100644
--- a/arch/x86/cpu/sc520/sc520_pci.c
+++ b/arch/x86/cpu/sc520/sc520_pci.c
@@ -28,8 +28,8 @@
#include <pci.h>
#include <asm/io.h>
#include <asm/pci.h>
-#include <asm/ic/pci.h>
-#include <asm/ic/sc520.h>
+#include <asm/arch/pci.h>
+#include <asm/arch/sc520.h>
static struct {
u8 priority;