summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-07-13 23:34:33 +0200
committerWolfgang Denk <wd@denx.de>2009-07-13 23:34:33 +0200
commit17f098bd4adb4bfa184db794f36b0b9c5a8577dc (patch)
treec49221ca855bbe3d1bf4f7af094cb12a4dff414e /include
parent70ad83376d86ede02fee840817986486ba6dfc68 (diff)
parent5db1dcce91e98915ef8a3377774f860ba601301c (diff)
downloadu-boot-imx-17f098bd4adb4bfa184db794f36b0b9c5a8577dc.zip
u-boot-imx-17f098bd4adb4bfa184db794f36b0b9c5a8577dc.tar.gz
u-boot-imx-17f098bd4adb4bfa184db794f36b0b9c5a8577dc.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include')
-rw-r--r--include/common.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h
index 7ba6187..a6c7c07 100644
--- a/include/common.h
+++ b/include/common.h
@@ -275,7 +275,8 @@ void pci_init_board(void);
void pciinfo (int, int);
#if defined(CONFIG_PCI) && (defined(CONFIG_4xx) && !defined(CONFIG_AP1000))
- int pci_pre_init (struct pci_controller * );
+ int pci_pre_init (struct pci_controller *);
+ int is_pci_host (struct pci_controller *);
#endif
#if defined(CONFIG_PCI) && (defined(CONFIG_440) || defined(CONFIG_405EX))
@@ -285,7 +286,6 @@ void pciinfo (int, int);
# if defined(CONFIG_SYS_PCI_MASTER_INIT)
void pci_master_init (struct pci_controller *);
# endif
- int is_pci_host (struct pci_controller *);
#if defined(CONFIG_440SPE) || \
defined(CONFIG_460EX) || defined(CONFIG_460GT) || \
defined(CONFIG_405EX)