Merge branch 'master' of git://git.denx.de/u-boot-arm into master

[karo-tx-uboot.git] / include / pci.h

diff --git a/include/pci.h b/include/pci.h
index d462479667702e9369a08e10ad360c13ba0983f6..461f17c058950d89f572545dbcd981e4b4eb6838 100644 (file)
--- 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 */