diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-07-13 21:39:13 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-07-13 21:39:13 +0200 |
| commit | bc2962482b707e44e0b43d20bd4dcf2a40230abb (patch) | |
| tree | 751c5e07c5ff0aa7910da0fe33b0a0996bda518c /include/common.h | |
| parent | 093172f08d6afb3f34d8a2f26ee0ee874261cf27 (diff) | |
| parent | 239f05ee4dd4cfe0b50f251b533dcebe9e67c360 (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 3c4b37b0dcb..d8b6b469e5f 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 |