1.1 --- a/xen/arch/ia64/linux-xen/sn/kernel/io_init.c	Fri Jun 22 11:44:44 2007 -0600
     1.2 +++ b/xen/arch/ia64/linux-xen/sn/kernel/io_init.c	Fri Jun 22 11:48:49 2007 -0600
     1.3 @@ -182,7 +182,6 @@ sn_pcidev_info_get(struct pci_dev *dev)
     1.4  	}
     1.5  	return NULL;
     1.6  }
     1.7 -#endif
     1.8  
     1.9  /* Older PROM flush WAR
    1.10   *
    1.11 @@ -362,7 +361,6 @@ sn_pci_window_fixup(struct pci_dev *dev,
    1.12  	controller->window = new_window;
    1.13  }
    1.14  
    1.15 -#ifndef XEN
    1.16  void sn_pci_unfixup_slot(struct pci_dev *dev)
    1.17  {
    1.18  	struct pci_dev *host_pci_dev = SN_PCIDEV_INFO(dev)->host_pci_dev;
    1.19 @@ -658,7 +656,9 @@ void sn_bus_free_sysdata(void)
    1.20  static int __init sn_io_early_init(void)
    1.21  {
    1.22  	int i, j;
    1.23 +#ifndef XEN
    1.24  	struct pci_dev *pci_dev = NULL;
    1.25 +#endif
    1.26  
    1.27  	if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
    1.28  		return 0;