patch-2.4.14 linux/include/asm-arm/arch-sa1100/bitfield.h

• Lines: 37
• Date: Thu Oct 25 13:53:54 2001
• Orig file: v2.4.13/linux/include/asm-arm/arch-sa1100/bitfield.h
• Orig date: Tue Jul 18 22:43:25 2000

diff -u --recursive --new-file v2.4.13/linux/include/asm-arm/arch-sa1100/bitfield.h linux/include/asm-arm/arch-sa1100/bitfield.h
@@ -12,21 +12,14 @@
 
 
 
-#ifndef BITFIELD
-#define BITFIELD
+#ifndef __BITFIELD_H
+#define __BITFIELD_H
 
-#ifndef LANGUAGE
-#define LANGUAGE	C
-#endif /* !defined (LANGUAGE) */
-
-#define C       	0
-#define Assembly	1
-
-#if LANGUAGE == C
-#define UData(Data)	((unsigned int) (Data))
-#elif LANGUAGE == Assembly
+#ifndef __ASSEMBLY__
+#define UData(Data)	((unsigned long) (Data))
+#else
 #define UData(Data)	(Data)
-#endif /* LANGUAGE == C || LANGUAGE == Assembly */
+#endif
 
 
 /*
@@ -117,7 +110,4 @@
                 	((UData (Data) >> FShft (Field)) & FAlnMsk (Field))
 
 
-#undef C
-#undef Assembly
-
-#endif /* !defined (BITFIELD) */
+#endif /* __BITFIELD_H */