patch-2.4.21 linux-2.4.21/include/asm-ppc/mpc8260.h

• Lines: 32
• Date: 2003-06-13 07:51:38.000000000 -0700
• Orig file: linux-2.4.20/include/asm-ppc/mpc8260.h
• Orig date: 2002-11-28 15:53:15.000000000 -0800

diff -urN linux-2.4.20/include/asm-ppc/mpc8260.h linux-2.4.21/include/asm-ppc/mpc8260.h
@@ -1,7 +1,3 @@
-/*
- * BK Id: %F% %I% %G% %U% %#%
- */
-
 /* This is the single file included by all MPC8260 build options.
  * Since there are many different boards and no standard configuration,
  * we have a unique include file for each.  Rather than change every
@@ -27,20 +23,14 @@
 #define _ISA_MEM_BASE   0
 #define PCI_DRAM_OFFSET 0
 
+#ifndef __ASSEMBLY__
 /* The "residual" data board information structure the boot loader
  * hands to us.
  */
 extern unsigned char __res[];
+#endif /* __ASSEMBLY__ */
 
-/* I need this to get pt_regs.......
-*/
-#include <asm/ptrace.h>
-
-extern int request_8xxirq(unsigned int irq,
-		       void (*handler)(int, void *, struct pt_regs *),
-		       unsigned long flags, 
-		       const char *device,
-		       void *dev_id);
+#define request_8xxirq request_irq
 
 #endif /* CONFIG_8260 */
 #endif /* !__CONFIG_8260_DEFS */