From: Paul Mackerras <paulus@samba.org>
Date: Wed, 27 Sep 2006 21:18:28 +0000 (+1000)
Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4e6d816e51728d5006c53e78e079ac62b902f8aa;p=mv-sheeva.git

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux-2.6-PQ
---

4e6d816e51728d5006c53e78e079ac62b902f8aa
diff --cc arch/powerpc/sysdev/fsl_soc.h
index 5a3dd480d2f,25230ceffbc..04e145b5fc3
--- a/arch/powerpc/sysdev/fsl_soc.h
+++ b/arch/powerpc/sysdev/fsl_soc.h
@@@ -2,9 -2,9 +2,11 @@@
  #define __PPC_FSL_SOC_H
  #ifdef __KERNEL__
  
 +#include <asm/mmu.h>
 +
  extern phys_addr_t get_immrbase(void);
+ extern u32 get_brgfreq(void);
+ extern u32 get_baudrate(void);
  
  #endif
  #endif