patch-2.4.11-dontuse linux/include/asm-ppc/oak.h

Next file: linux/include/asm-ppc/processor.h
Previous file: linux/include/asm-ppc/mmu_context.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.10/linux/include/asm-ppc/oak.h linux/include/asm-ppc/oak.h
@@ -1,5 +1,5 @@
 /*
- * BK Id: SCCS/s.oak.h 1.7 05/17/01 18:14:25 cort
+ * BK Id: SCCS/s.oak.h 1.10 09/14/01 17:37:56 trini
  */
 /*
  *
@@ -20,11 +20,6 @@
 
 #include <asm/irq.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define _IO_BASE	0
 #define _ISA_MEM_BASE	0
 #define PCI_DRAM_OFFSET	0
@@ -48,6 +43,7 @@
 #define	OAKNET_INT		AIC_INT27
 #define	OAKSERIAL_INT		AIC_INT28
 
+#ifndef __ASSEMBLY__
 /*
  * Data structure defining board information maintained by the boot
  * ROM on IBM's "Oak" evaluation board. An effort has been made to
@@ -64,15 +60,6 @@
 	unsigned int	 bi_busfreq;		/* Bus speed, in Hz */
 } bd_t;
 
-
-#ifdef __cplusplus
-}
-#endif
-
-/* Generic 4xx type
-*/
-#define _MACH_4xx (_MACH_oak)
-
-
+#endif /* !__ASSEMBLY__ */
 #endif /* __OAK_H__ */
 #endif /* __KERNEL__ */

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