ia64/xen-unstable

changeset 4253:db5cb5193ffc

bitkeeper revision 1.1236.1.106 (423fdf68Jj2B3iL1Ab8caOSNgsAs-w)

Cross-architecture build fixes.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue Mar 22 09:03:36 2005 +0000 (2005-03-22)
parents 486217f3ad4f
children ed581e07c97f
files xen/drivers/char/console.c xen/drivers/pci/quirks.c
line diff
     1.1 --- a/xen/drivers/char/console.c	Tue Mar 22 09:00:30 2005 +0000
     1.2 +++ b/xen/drivers/char/console.c	Tue Mar 22 09:03:36 2005 +0000
     1.3 @@ -20,6 +20,7 @@
     1.4  #include <asm/uaccess.h>
     1.5  #include <asm/mm.h>
     1.6  #include <asm/debugger.h>
     1.7 +#include <asm/io.h>
     1.8  
     1.9  /* opt_console: comma-separated list of console outputs. */
    1.10  static char opt_console[30] = OPT_CONSOLE_STR;
     2.1 --- a/xen/drivers/pci/quirks.c	Tue Mar 22 09:00:30 2005 +0000
     2.2 +++ b/xen/drivers/pci/quirks.c	Tue Mar 22 09:03:36 2005 +0000
     2.3 @@ -18,7 +18,6 @@
     2.4  #include <xen/pci.h>
     2.5  #include <xen/init.h>
     2.6  #include <xen/delay.h>
     2.7 -#include <asm/io_apic.h>
     2.8  
     2.9  #undef DEBUG
    2.10  
    2.11 @@ -333,6 +332,8 @@ static void __init quirk_vt82c686_acpi(s
    2.12  
    2.13  #ifdef CONFIG_X86_IO_APIC 
    2.14  
    2.15 +#include <asm/io_apic.h>
    2.16 +
    2.17  /*
    2.18   * VIA 686A/B: If an IO-APIC is active, we need to route all on-chip
    2.19   * devices to the external APIC.