]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux...
authorPaul Mackerras <paulus@samba.org>
Wed, 27 Sep 2006 21:18:28 +0000 (07:18 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 27 Sep 2006 21:18:28 +0000 (07:18 +1000)
1  2 
arch/powerpc/sysdev/fsl_soc.h
drivers/net/fs_enet/fs_enet-main.c

index 5a3dd480d2fd8eff791e62ae40e12de8a553b22a,25230ceffbcf05e5ca444019d8d7a188b3bd5eb4..04e145b5fc324066ebb52d2f895d8538270c3506
@@@ -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
Simple merge