diff options
| author | Stefan Roese <sr@denx.de> | 2007-07-04 08:11:37 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-07-04 08:11:37 +0200 |
| commit | 8e990cb076a1c77daf3a50cc0df9732135e9eef5 (patch) | |
| tree | 3b860d74bb4ddc5e0c9485e44da1bc0a08ed839c /include/common.h | |
| parent | d677b32855f577ae2690dcd64a172cdd706e0ffc (diff) | |
| parent | 98c440bee623ecdd5322852732b883e696fb2140 (diff) | |
| download | u-boot-imx-8e990cb076a1c77daf3a50cc0df9732135e9eef5.zip u-boot-imx-8e990cb076a1c77daf3a50cc0df9732135e9eef5.tar.gz u-boot-imx-8e990cb076a1c77daf3a50cc0df9732135e9eef5.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/common.h b/include/common.h index 3c4b37b..d8b6b46 100644 --- a/include/common.h +++ b/include/common.h @@ -38,7 +38,7 @@ typedef volatile unsigned char vu_char; #include <linux/string.h> #include <asm/ptrace.h> #include <stdarg.h> -#if defined(CONFIG_PCI) && defined(CONFIG_440) +#if defined(CONFIG_PCI) && (defined(CONFIG_4xx) && !defined(CONFIG_AP1000)) #include <pci.h> #endif #if defined(CONFIG_8xx) @@ -248,10 +248,11 @@ void pci_init (void); void pci_init_board(void); void pciinfo (int, int); -#if defined(CONFIG_PCI) && defined(CONFIG_440) -# if defined(CFG_PCI_PRE_INIT) +#if defined(CONFIG_PCI) && (defined(CONFIG_4xx) && !defined(CONFIG_AP1000)) int pci_pre_init (struct pci_controller * ); -# endif +#endif + +#if defined(CONFIG_PCI) && defined(CONFIG_440) # if defined(CFG_PCI_TARGET_INIT) void pci_target_init (struct pci_controller *); # endif |