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

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

Update of /cvsroot/gc-linux/linux/arch/powerpc/include/asm
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17071/arch/powerpc/include/asm

Modified Files:
	dma-mapping.h udbg.h 
Log Message:
Rewind to v2.6.31.


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

Index: udbg.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/include/asm/udbg.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** udbg.h	25 Oct 2009 18:59:27 -0000	1.7
--- udbg.h	9 Dec 2009 18:18:06 -0000	1.8
***************
*** 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__ */
--- 52,55 ----