17 files changed, 4 insertions, 4 deletions
diff --git a/cpu/i386/Makefile b/arch/i386/cpu/Makefile
index c658c6e459..c658c6e459 100644
--- a/cpu/i386/Makefile
+++ b/arch/i386/cpu/Makefile
diff --git a/cpu/i386/config.mk b/arch/i386/cpu/config.mk
index 16a160d2f3..16a160d2f3 100644
--- a/cpu/i386/config.mk
+++ b/arch/i386/cpu/config.mk
diff --git a/cpu/i386/cpu.c b/arch/i386/cpu/cpu.c
index 3010519e74..3010519e74 100644
--- a/cpu/i386/cpu.c
+++ b/arch/i386/cpu/cpu.c
diff --git a/cpu/i386/interrupts.c b/arch/i386/cpu/interrupts.c
index 4b57437193..4b57437193 100644
--- a/cpu/i386/interrupts.c
+++ b/arch/i386/cpu/interrupts.c
diff --git a/cpu/i386/resetvec.S b/arch/i386/cpu/resetvec.S
index d9222dd2fc..d9222dd2fc 100644
--- a/cpu/i386/resetvec.S
+++ b/arch/i386/cpu/resetvec.S
diff --git a/cpu/i386/sc520/Makefile b/arch/i386/cpu/sc520/Makefile
index 87835b2c20..87835b2c20 100644
--- a/cpu/i386/sc520/Makefile
+++ b/arch/i386/cpu/sc520/Makefile
diff --git a/cpu/i386/sc520/sc520.c b/arch/i386/cpu/sc520/sc520.c
index 4b566a75cc..4b566a75cc 100644
--- a/cpu/i386/sc520/sc520.c
+++ b/arch/i386/cpu/sc520/sc520.c
diff --git a/cpu/i386/sc520/sc520_asm.S b/arch/i386/cpu/sc520/sc520_asm.S
index 2042d9bfcf..2042d9bfcf 100644
--- a/cpu/i386/sc520/sc520_asm.S
+++ b/arch/i386/cpu/sc520/sc520_asm.S
diff --git a/cpu/i386/sc520/sc520_pci.c b/arch/i386/cpu/sc520/sc520_pci.c
index f446c6d592..f446c6d592 100644
--- a/cpu/i386/sc520/sc520_pci.c
+++ b/arch/i386/cpu/sc520/sc520_pci.c
diff --git a/cpu/i386/sc520/sc520_ssi.c b/arch/i386/cpu/sc520/sc520_ssi.c
index 8dbe17aa60..8dbe17aa60 100644
--- a/cpu/i386/sc520/sc520_ssi.c
+++ b/arch/i386/cpu/sc520/sc520_ssi.c
diff --git a/cpu/i386/sc520/sc520_timer.c b/arch/i386/cpu/sc520/sc520_timer.c
index 93b5b555c3..93b5b555c3 100644
--- a/cpu/i386/sc520/sc520_timer.c
+++ b/arch/i386/cpu/sc520/sc520_timer.c
diff --git a/cpu/i386/serial.c b/arch/i386/cpu/serial.c
index e7025a3cdc..e7025a3cdc 100644
--- a/cpu/i386/serial.c
+++ b/arch/i386/cpu/serial.c
diff --git a/cpu/i386/start.S b/arch/i386/cpu/start.S
index 25d32e658e..25d32e658e 100644
--- a/cpu/i386/start.S
+++ b/arch/i386/cpu/start.S
diff --git a/cpu/i386/start16.S b/arch/i386/cpu/start16.S
index 1ebb6bc8b6..1ebb6bc8b6 100644
--- a/cpu/i386/start16.S
+++ b/arch/i386/cpu/start16.S
diff --git a/arch/i386/include/asm/interrupt.h b/arch/i386/include/asm/interrupt.h
index 8d324d9f37..07426fe6a7 100644
--- a/arch/i386/include/asm/interrupt.h
+++ b/arch/i386/include/asm/interrupt.h
@@ -27,7 +27,7 @@
 #ifndef __ASM_INTERRUPT_H_
 #define __ASM_INTERRUPT_H_ 1
 
-/* cpu/i386/interrupts.c */
+/* arch/i386/cpu/interrupts.c */
 void set_vector(u8 intnum, void *routine);
 
 /* arch/i386/lib/interupts.c */
diff --git a/arch/i386/include/asm/u-boot-i386.h b/arch/i386/include/asm/u-boot-i386.h
index a08632d2d3..521fd352bb 100644
--- a/arch/i386/include/asm/u-boot-i386.h
+++ b/arch/i386/include/asm/u-boot-i386.h
@@ -33,7 +33,7 @@ void timer_isr(void *);
 typedef void (timer_fnc_t) (void);
 int register_timer_isr (timer_fnc_t *isr_func);
 
-/* Architecture specific - can be in cpu/i386/, arch/i386/lib/, or $(BOARD)/ */
+/* Architecture specific - can be in arch/i386/cpu/, arch/i386/lib/, or $(BOARD)/ */
 int timer_init(void);
 
 /* cpu/.../interrupts.c */
diff --git a/doc/TODO-i386 b/doc/TODO-i386
index 2261f4a1f3..9b6c5d41ab 100644
--- a/doc/TODO-i386
+++ b/doc/TODO-i386
@@ -4,11 +4,11 @@ i386 port missing features:
 * setup the BIOS data area and BIOS equipment word to reflect machine config. 
 * Make reset work (from Linux and from the boot prompt)
 * DMA, FDC, RTC, KBC initialization
-* split of part of cpu/i386/interrupt.c to cpu/i385/entry.c?
+* split of part of arch/i386/cpu/interrupt.c to cpu/i385/entry.c?
 * re-entry of protected mode from real mode, should be added to realmode_switch.S 
   (and used by INT 10h and INT 16h handlers for console I/O during early
    linux boot...) 
-* missing functions in arch/i386/lib and cpu/i386
+* missing functions in arch/i386/lib and arch/i386/cpu
 * speaker beep interface