Merge branch 'master' of http://www.denx.de/git/u-boot

[platform/kernel/u-boot.git] / include / common.h

diff --git a/include/common.h b/include/common.h
index 9da66b8..8000dd0 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -252,6 +252,9 @@ void        pciinfo       (int, int);
        void    pci_master_init      (struct pci_controller *);
 #   endif
     int            is_pci_host         (struct pci_controller *);
+#if defined(CONFIG_440SPE)
+   void pcie_setup_hoses(void);
+#endif
 #endif
 
 int    misc_init_f   (void);
@@ -474,6 +477,7 @@ void   get_sys_info  ( sys_info_t * );
 #      if defined(CONFIG_440SPE)
         unsigned long determine_sysper(void);
         unsigned long determine_pci_clock_per(void);
+        int ppc440spe_revB(void);
 #      endif
 #  else
     typedef PPC405_SYS_INFO sys_info_t;
@@ -611,7 +615,7 @@ void        show_boot_progress (int status);
 #endif
 
 #ifdef CONFIG_INIT_CRITICAL
-#error CONFIG_INIT_CRITICAL is depracted!
+#error CONFIG_INIT_CRITICAL is deprecated!
 #error Read section CONFIG_SKIP_LOWLEVEL_INIT in README.
 #endif