patch-2.4.22 linux-2.4.22/include/asm-mips/jmr3927/tx3927.h

Next file: linux-2.4.22/include/asm-mips/jmr3927/txx927.h
Previous file: linux-2.4.22/include/asm-mips/jmr3927/pci.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/include/asm-mips/jmr3927/tx3927.h linux-2.4.22/include/asm-mips/jmr3927/tx3927.h
@@ -5,8 +5,8 @@
  *
  * Copyright (C) 2000 Toshiba Corporation
  */
-#ifndef __ASM_TX3927_H 
-#define __ASM_TX3927_H 
+#ifndef __ASM_TX3927_H
+#define __ASM_TX3927_H
 
 #include <asm/jmr3927/txx927.h>
 
@@ -22,7 +22,7 @@
 #define TX3927_SIO_REG(ch)	(0xfffef300 + (ch) * 0x100)
 #define TX3927_PIO_REG		0xfffef500
 
-#ifndef _LANGUAGE_ASSEMBLY
+#ifndef __ASSEMBLY__
 
 struct tx3927_sdramc_reg {
 	volatile unsigned long cr[8];
@@ -164,7 +164,7 @@
 	volatile unsigned long pdcr;
 };
 
-#endif /* _LANGUAGE_ASSEMBLY */
+#endif /* !__ASSEMBLY__ */
 
 /*
  * SDRAMC
@@ -348,7 +348,7 @@
 #define TX3927_PCFG_SELDMA_ALL	0x0000000f
 #define TX3927_PCFG_SELDMA(ch)	(0x00000001<<(ch))
 
-#ifndef _LANGUAGE_ASSEMBLY
+#ifndef __ASSEMBLY__
 
 #define tx3927_sdramcptr	((struct tx3927_sdramc_reg *)TX3927_SDRAMC_REG)
 #define tx3927_romcptr		((struct tx3927_romc_reg *)TX3927_ROMC_REG)
@@ -360,6 +360,6 @@
 #define tx3927_sioptr(ch)	((struct txx927_sio_reg *)TX3927_SIO_REG(ch))
 #define tx3927_pioptr		((struct txx927_pio_reg *)TX3927_PIO_REG)
 
-#endif /* _LANGUAGE_ASSEMBLY */
+#endif /* !__ASSEMBLY__ */
 
 #endif /* __ASM_TX3927_H */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)