diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2007-07-06 19:39:48 -0500 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2007-07-06 19:39:48 -0500 |
| commit | 0459e7d3a0a273064b738aa2e06fd7dcd35eec58 (patch) | |
| tree | 83b8a3044400cb1463e91410cf0f3732dedd7fb4 /include/common.h | |
| parent | 30d5c04c93084fe0b144646b77eb873957872a8d (diff) | |
| parent | e80955f07de03fef0196353e77534b2300193c1c (diff) | |
Merge git://www.denx.de/git/u-boot
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 3c4b37b0d..d8b6b469e 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 |