ia64/xen-unstable

changeset 7512:98209d207d14

Fix gcc-3.4 compiler errors (submitted by Takebe Akio)
author djm@kirby.fc.hp.com
date Thu Nov 03 18:06:15 2005 -0600 (2005-11-03)
parents f1949cd70f89
children b4263a0216a9
files xen/arch/ia64/linux-xen/efi.c xen/arch/ia64/linux-xen/mm_contig.c
line diff
     1.1 --- a/xen/arch/ia64/linux-xen/efi.c	Thu Nov 03 16:50:44 2005 -0600
     1.2 +++ b/xen/arch/ia64/linux-xen/efi.c	Thu Nov 03 18:06:15 2005 -0600
     1.3 @@ -24,7 +24,6 @@
     1.4  #include <linux/init.h>
     1.5  #include <linux/types.h>
     1.6  #include <linux/time.h>
     1.7 -#include <linux/efi.h>
     1.8  
     1.9  #include <asm/io.h>
    1.10  #include <asm/kregs.h>
    1.11 @@ -33,6 +32,8 @@
    1.12  #include <asm/processor.h>
    1.13  #include <asm/mca.h>
    1.14  
    1.15 +#include <linux/efi.h>
    1.16 +
    1.17  #define EFI_DEBUG	0
    1.18  
    1.19  extern efi_status_t efi_call_phys (void *, ...);
     2.1 --- a/xen/arch/ia64/linux-xen/mm_contig.c	Thu Nov 03 16:50:44 2005 -0600
     2.2 +++ b/xen/arch/ia64/linux-xen/mm_contig.c	Thu Nov 03 18:06:15 2005 -0600
     2.3 @@ -16,7 +16,6 @@
     2.4   */
     2.5  #include <linux/config.h>
     2.6  #include <linux/bootmem.h>
     2.7 -#include <linux/efi.h>
     2.8  #include <linux/mm.h>
     2.9  #include <linux/swap.h>
    2.10  
    2.11 @@ -26,6 +25,7 @@
    2.12  #include <asm/sections.h>
    2.13  #include <asm/mca.h>
    2.14  
    2.15 +#include <linux/efi.h>
    2.16  #ifdef CONFIG_VIRTUAL_MEM_MAP
    2.17  static unsigned long num_dma_physpages;
    2.18  #endif