ia64/xen-unstable

changeset 4554:a7679ebfe9cc

bitkeeper revision 1.1159.258.99 (42641f67D11Zf7wIb-qAVu9io6tamQ)

[PATCH] IO-APIC in drivers/pci/quirks.c

This patch moves the IO-APIC include inside #ifdef CONFIG_X86_IO_APIC , which
is how Linux 2.6 has it. This is needed for architectures without
asm/io_apic.h. I've verified that x86 still builds; please apply.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

===== xen/drivers/pci/quirks.c 1.9 vs edited =====
author hollisb@us.ibm.com[iap10]
date Mon Apr 18 20:58:15 2005 +0000 (2005-04-18)
parents 4099062dbee6
children 3b3304b0c738 c35967b5863a
files BitKeeper/etc/logging_ok xen/drivers/pci/quirks.c
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Fri Apr 15 22:19:51 2005 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Mon Apr 18 20:58:15 2005 +0000
     1.3 @@ -20,6 +20,7 @@ djm@kirby.fc.hp.com
     1.4  doogie@brainfood.com
     1.5  gm281@boulderdash.cl.cam.ac.uk
     1.6  gm281@tetrapod.cl.cam.ac.uk
     1.7 +hollisb@us.ibm.com
     1.8  iap10@freefall.cl.cam.ac.uk
     1.9  iap10@labyrinth.cl.cam.ac.uk
    1.10  iap10@nidd.cl.cam.ac.uk
     2.1 --- a/xen/drivers/pci/quirks.c	Fri Apr 15 22:19:51 2005 +0000
     2.2 +++ b/xen/drivers/pci/quirks.c	Mon Apr 18 20:58:15 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.