[Gc-linux-cvs] linux/arch/powerpc/include/asm dma-mapping.h, 1.4, 1.5 udbg.h, 1.6, 1.7

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/powerpc/include/asm
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv751/arch/powerpc/include/asm

Modified Files:
	dma-mapping.h udbg.h 
Log Message:
Merge gc-linux-v2.6.31.


Index: dma-mapping.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/include/asm/dma-mapping.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dma-mapping.h	25 Oct 2009 18:56:55 -0000	1.4
--- dma-mapping.h	25 Oct 2009 18:59:27 -0000	1.5
***************
*** 17,20 ****
--- 17,21 ----
  #include <asm/io.h>
  #include <asm/swiotlb.h>
+ #include <asm-generic/dma-coherent.h>
  
  #define DMA_ERROR_CODE		(~(dma_addr_t)0x0)

Index: udbg.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/include/asm/udbg.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** udbg.h	25 Oct 2009 18:53:45 -0000	1.6
--- udbg.h	25 Oct 2009 18:59:27 -0000	1.7
***************
*** 52,55 ****
--- 52,56 ----
  extern void __init udbg_init_40x_realmode(void);
  extern void __init udbg_init_cpm(void);
+ extern void __init udbg_init_usbgecko(void);
  
  #endif /* __KERNEL__ */