summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2013-11-08 11:18:47 +0000
committerDaniel Schwierzeck <daniel.schwierzeck@gmail.com>2013-11-09 17:21:01 +0100
commitfa5cec032180a997b82b52f0b6075aa548a953cd (patch)
tree765be3faa3556942b5a5876996e62053151a8a8f /include
parent62715a2c57c01630af8198ed108874def5a99cf7 (diff)
pci.h: allow inclusion in assembly source
This patch simply #ifdef's out the C-specific parts of pci.h when it is included by an assembly file. This will allow the macros it contains to be used from assembly source as will be done in a followup commit adding support for more modern MIPS Malta boards. Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Diffstat (limited to 'include')
-rw-r--r--include/pci.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/pci.h b/include/pci.h
index d4624796677..461f17c0589 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -417,6 +417,8 @@
#include <pci_ids.h>
+#ifndef __ASSEMBLY__
+
#ifdef CONFIG_SYS_PCI_64BIT
typedef u64 pci_addr_t;
typedef u64 pci_size_t;
@@ -667,4 +669,6 @@ extern void pci_mpc824x_init (struct pci_controller *hose);
#ifdef CONFIG_MPC85xx
extern void pci_mpc85xx_init (struct pci_controller *hose);
#endif
-#endif /* _PCI_H */
+
+#endif /* __ASSEMBLY__ */
+#endif /* _PCI_H */