ia64/xen-unstable

changeset 6857:55bc6698c889

Oops, one hypervisor.h change seems to have unfixed in the merge
author djm@kirby.fc.hp.com
date Wed Sep 14 18:00:23 2005 -0600 (2005-09-14)
parents 0833c2337202
children 8e7df3b10d85 3233e7ecfa9f
files linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Wed Sep 14 17:01:42 2005 -0600
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Wed Sep 14 18:00:23 2005 -0600
     1.3 @@ -26,7 +26,7 @@
     1.4  #include <asm/uaccess.h>
     1.5  #include <asm/tlb.h>
     1.6  #include <asm-xen/linux-public/privcmd.h>
     1.7 -#include <asm-xen/linux-public/hypervisor.h>
     1.8 +#include <asm/hypervisor.h>
     1.9  #include <asm-xen/xen-public/xen.h>
    1.10  #include <asm-xen/xen-public/dom0_ops.h>
    1.11  #include <asm-xen/xen_proc.h>