[LV-commit] CVS: kernel-2.5/include/asm-x86_64 dma-mapping.h,1.3,1.4

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-x86_64
In directory sc8-pr-cvs1:/tmp/cvs-serv18198/include/asm-x86_64

Modified Files:
	dma-mapping.h 
Log Message:
Merge with 2.5.61


Index: dma-mapping.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-x86_64/dma-mapping.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dma-mapping.h	3 Aug 2003 19:00:40 -0000	1.3
+++ dma-mapping.h	5 Aug 2003 23:17:56 -0000	1.4
@@ -1,5 +1,5 @@
-#ifndef _ASM_X8664_DMA_MAPPING_H
-#define _ASM_X8664_DMA_MAPPING_H
+#ifndef _X8664_DMA_MAPPING_H
+#define _X8664_DMA_MAPPING_H 1
 
 #include <asm-generic/dma-mapping.h>