summaryrefslogtreecommitdiffstats
path: root/arch/sparc/include/asm/pci.h
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-08-08 22:10:12 +0200
committerBen Dooks <ben-linux@fluff.org>2008-08-08 22:10:12 +0200
commitaf7a535688a758d15f06a98833e6a143b29af9de (patch)
treebac5ab210bbbbe276f0e44ed84194d7c8bb16aae /arch/sparc/include/asm/pci.h
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff)
parent[ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB (diff)
downloadlinux-af7a535688a758d15f06a98833e6a143b29af9de.tar.xz
linux-af7a535688a758d15f06a98833e6a143b29af9de.zip
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
Diffstat (limited to 'arch/sparc/include/asm/pci.h')
-rw-r--r--arch/sparc/include/asm/pci.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/pci.h b/arch/sparc/include/asm/pci.h
new file mode 100644
index 000000000000..6e14fd179335
--- /dev/null
+++ b/arch/sparc/include/asm/pci.h
@@ -0,0 +1,8 @@
+#ifndef ___ASM_SPARC_PCI_H
+#define ___ASM_SPARC_PCI_H
+#if defined(__sparc__) && defined(__arch64__)
+#include <asm/pci_64.h>
+#else
+#include <asm/pci_32.h>
+#endif
+#endif