Index: 2006-01-05/arch/x86_64/kernel/apic-xen.c
===================================================================
--- 2006-01-05.orig/arch/x86_64/kernel/apic-xen.c	2006-01-06 11:47:17.880118760 +0100
+++ 2006-01-05/arch/x86_64/kernel/apic-xen.c	2006-01-06 11:00:20.000000000 +0100
@@ -34,8 +34,6 @@
 #include <asm/arch_hooks.h>
 #include <asm/hpet.h>
 
-#include "io_ports.h"
-
 /*
  * Debug level
  */
Index: 2006-01-05/include/asm-x86_64/mach-xen/io_ports.h
===================================================================
--- 2006-01-05.orig/include/asm-x86_64/mach-xen/io_ports.h	2006-01-06 11:47:17.881118608 +0100
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/*
- *  arch/i386/mach-generic/io_ports.h
- *
- *  Machine specific IO port address definition for generic.
- *  Written by Osamu Tomita <tomita@xxxxxxxxxxx>
- */
-#ifndef _MACH_IO_PORTS_H
-#define _MACH_IO_PORTS_H
-
-/* i8253A PIT registers */
-#define PIT_MODE		0x43
-#define PIT_CH0			0x40
-#define PIT_CH2			0x42
-
-/* i8259A PIC registers */
-#define PIC_MASTER_CMD		0x20
-#define PIC_MASTER_IMR		0x21
-#define PIC_MASTER_ISR		PIC_MASTER_CMD
-#define PIC_MASTER_POLL		PIC_MASTER_ISR
-#define PIC_MASTER_OCW3		PIC_MASTER_ISR
-#define PIC_SLAVE_CMD		0xa0
-#define PIC_SLAVE_IMR		0xa1
-
-/* i8259A PIC related value */
-#define PIC_CASCADE_IR		2
-#define MASTER_ICW4_DEFAULT	0x01
-#define SLAVE_ICW4_DEFAULT	0x01
-#define PIC_ICW4_AEOI		2
-
-#endif /* !_MACH_IO_PORTS_H */
Index: 2006-01-05/arch/i386/kernel/time-xen.c
===================================================================
--- 2006-01-05.orig/arch/i386/kernel/time-xen.c	2006-01-06 11:47:17.879118912 +0100
+++ 2006-01-05/arch/i386/kernel/time-xen.c	2006-01-06 11:06:52.000000000 +0100
@@ -68,8 +68,6 @@
 
 #include <asm/arch_hooks.h>
 
-#include "io_ports.h"
-
 #include <xen/evtchn.h>
 
 #if defined (__i386__)