]> xenbits.xensource.com Git - xen.git/commit
[IA64] Fix pci.h include overlap
authorKeir Fraser <keir.fraser@citrix.com>
Tue, 15 Apr 2008 09:21:17 +0000 (10:21 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Tue, 15 Apr 2008 09:21:17 +0000 (10:21 +0100)
commitd354d1ec9459f2ee534ed6fbdf178f644a313a09
tree101b6d1c1bc82972125b2bb54bc13a2d1de5848e
parenta29af79e4ecf404bbd084b7b39cf139b963982ea
[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
xen/include/asm-ia64/linux-xen/asm/sn/README.origin
xen/include/asm-ia64/linux-xen/asm/sn/pcibr_provider.h
xen/include/asm-ia64/linux-xen/asm/sn/pcidev.h [new file with mode: 0644]
xen/include/asm-ia64/linux-xen/linux/linux-pci.h [new file with mode: 0644]
xen/include/asm-ia64/linux-xen/linux/pci.h [deleted file]
xen/include/asm-ia64/linux/asm/sn/README.origin
xen/include/asm-ia64/linux/asm/sn/pcidev.h [deleted file]