[Gc-linux-cvs] linux/arch/powerpc/include/asm dma-mapping.h, 1.7, 1.8 starlet-ios.h, 1.1, 1.2 udbg.h, 1.8, 1.9

[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-serv22540/arch/powerpc/include/asm

Modified Files:
	dma-mapping.h starlet-ios.h udbg.h 
Log Message:
Merge v2.6.32.

Index: dma-mapping.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/include/asm/dma-mapping.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** dma-mapping.h	9 Dec 2009 18:40:09 -0000	1.7
--- dma-mapping.h	9 Dec 2009 18:44:54 -0000	1.8
***************
*** 18,21 ****
--- 18,22 ----
  #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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** udbg.h	9 Dec 2009 18:18:06 -0000	1.8
--- udbg.h	9 Dec 2009 18:44:54 -0000	1.9
***************
*** 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__ */

Index: starlet-ios.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/include/asm/starlet-ios.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** starlet-ios.h	25 Oct 2009 18:50:26 -0000	1.1
--- starlet-ios.h	9 Dec 2009 18:44:54 -0000	1.2
***************
*** 26,30 ****
  #include <asm/rheap.h>
  
! #define STARLET_TITLE_HBC	0x0001000148415858ULL
  
  #define STARLET_EINVAL	-4
--- 26,31 ----
  #include <asm/rheap.h>
  
! #define STARLET_TITLE_HBC_HAXX	0x0001000148415858ULL
! #define STARLET_TITLE_HBC_JODI	0x000100014A4F4449ULL
  
  #define STARLET_EINVAL	-4