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

• Lines: 54
• Date: 2003-08-25 04:44:43.000000000 -0700
• Orig file: linux-2.4.21/include/asm-mips/jmr3927/jmr3927.h
• Orig date: 2002-08-02 17:39:45.000000000 -0700

diff -urN linux-2.4.21/include/asm-mips/jmr3927/jmr3927.h linux-2.4.22/include/asm-mips/jmr3927/jmr3927.h
@@ -7,13 +7,13 @@
  *
  * Copyright (C) 2000-2001 Toshiba Corporation
  */
-#ifndef __ASM_TX3927_JMR3927_H 
-#define __ASM_TX3927_JMR3927_H 
+#ifndef __ASM_TX3927_JMR3927_H
+#define __ASM_TX3927_JMR3927_H
 
 #include <asm/jmr3927/tx3927.h>
 #include <asm/addrspace.h>
 #include <asm/jmr3927/irq.h>
-#ifndef _LANGUAGE_ASSEMBLY
+#ifndef __ASSEMBLY__
 #include <asm/system.h>
 #endif
 
@@ -36,14 +36,14 @@
 #define JMR3927_PORT_BASE	KSEG1
 
 /* select indirect initiator access per errata */
-#define JMR3927_INIT_INDIRECT_PCI 
+#define JMR3927_INIT_INDIRECT_PCI
 #define PCI_ISTAT_IDICC           0x1000
 #define PCI_IPCIBE_IBE_LONG       0
-#define PCI_IPCIBE_ICMD_IOREAD    2 
+#define PCI_IPCIBE_ICMD_IOREAD    2
 #define PCI_IPCIBE_ICMD_IOWRITE   3
-#define PCI_IPCIBE_ICMD_MEMREAD   6 
+#define PCI_IPCIBE_ICMD_MEMREAD   6
 #define PCI_IPCIBE_ICMD_MEMWRITE  7
-#define PCI_IPCIBE_ICMD_SHIFT     4 
+#define PCI_IPCIBE_ICMD_SHIFT     4
 
 /* Address map (virtual address) */
 #define JMR3927_ROM0_BASE	(KSEG1 + JMR3927_ROMCE0)
@@ -142,7 +142,7 @@
 #define JMR3927_ISAC_INTF_IRQ10	(1 << JMR3927_ISAC_INTB_IRQ10)
 #define JMR3927_ISAC_INTF_ISAER	(1 << JMR3927_ISAC_INTB_ISAER)
 
-#ifndef _LANGUAGE_ASSEMBLY
+#ifndef __ASSEMBLY__
 
 #if 0
 #define jmr3927_ioc_reg_out(d, a)	((*(volatile unsigned short *)(a)) = (d) << 8)
@@ -197,7 +197,7 @@
 #define jmr3927_io_dipsw()	(jmr3927_isac_reg_in(JMR3927_ISAC_LED_ADDR) >> 4)
 
 
-#endif /* _LANGUAGE_ASSEMBLY */
+#endif /* !__ASSEMBLY__ */
 
 /*
  * UART defines for serial.h