[IA64] Fix pci.h include overlap

The new upstream xen/pci.h has a name conflict with our modified
linux/pci.h and shows up earlier in the include search path.  Since
our usage of linux/pci.h is limited, rename to linux/linux-pci.h to
avoid duplicate names and cleanup the few users.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

xen/arch/ia64/linux-xen/sn/kernel/irq.c

@@ -12,7 +12,7 @@
 #include <linux/spinlock.h>
 #include <linux/init.h>
 #ifdef XEN
-#include <linux/pci.h>
+#include <linux/linux-pci.h>
 #include <asm/hw_irq.h>
 #endif
 #include <asm/sn/addrs.h>

xen/include/asm-ia64/linux-xen/asm/sn/README.origin

@@ -12,5 +12,6 @@ intr.h			-> linux/include/asm-ia64/sn/intr.h
 io.h			-> linux/include/asm-ia64/sn/io.h
 nodepda.h		-> linux/include/asm-ia64/sn/nodepda.h
 pcibr_provider.h	-> linux/include/asm-ia64/sn/pcibr_provider.h
+pcidev.h		-> linux/include/asm-ia64/sn/pcidev.h
 rw_mmr.h		-> linux/include/asm-ia64/sn/rw_mmr.h
 types.h			-> linux/include/asm-ia64/sn/types.h

xen/include/asm-ia64/linux-xen/asm/sn/pcibr_provider.h

@@ -10,7 +10,7 @@
 
 #ifdef XEN
 #include <linux/spinlock.h>
-#include <linux/pci.h>
+#include <linux/linux-pci.h>
 #endif
 #include <asm/sn/intr.h>
 #include <asm/sn/pcibus_provider_defs.h>

xen/include/asm-ia64/linux-xen/asm/sn/pcidev.h

@@ -8,7 +8,11 @@
 #ifndef _ASM_IA64_SN_PCI_PCIDEV_H
 #define _ASM_IA64_SN_PCI_PCIDEV_H
 
+#ifdef XEN
+#include <linux/linux-pci.h>
+#else
 #include <linux/pci.h>
+#endif
 
 /*
  * In ia64, pci_dev->sysdata must be a *pci_controller. To provide access to

xen/include/asm-ia64/linux/asm/sn/README.origin

@@ -10,7 +10,6 @@ l1.h			-> linux/include/asm-ia64/sn/l1.h
 leds.h			-> linux/include/asm-ia64/sn/leds.h
 module.h		-> linux/include/asm-ia64/sn/module.h
 pcibus_provider_defs.h	-> linux/include/asm-ia64/sn/pcibus_provider_defs.h
-pcidev.h		-> linux/include/asm-ia64/sn/pcidev.h
 pda.h			-> linux/include/asm-ia64/sn/pda.h
 pic.h			-> linux/include/asm-ia64/sn/pic.h
 shub_mmr.h		-> linux/include/asm-ia64/sn/shub_mmr.h