patch-2.4.21 linux-2.4.21/include/asm-ppc/mpc8xx.h
Next file: linux-2.4.21/include/asm-ppc/msgbuf.h
Previous file: linux-2.4.21/include/asm-ppc/mpc8260.h
Back to the patch index
Back to the overall index
- Lines: 67
- Date:
2003-06-13 07:51:38.000000000 -0700
- Orig file:
linux-2.4.20/include/asm-ppc/mpc8xx.h
- Orig date:
2002-11-28 15:53:15.000000000 -0800
diff -urN linux-2.4.20/include/asm-ppc/mpc8xx.h linux-2.4.21/include/asm-ppc/mpc8xx.h
@@ -1,7 +1,3 @@
-/*
- * BK Id: %F% %I% %G% %U% %#%
- */
-
/* This is the single file included by all MPC8xx build options.
* Since there are many different boards and no standard configuration,
* we have a unique include file for each. Rather than change every
@@ -49,26 +45,32 @@
#endif
-/* Currently, all 8xx boards that support a processor to PCI/ISA bridge
- * use the same memory map.
- */
-#if 0
-#if defined(CONFIG_PCI) && defined(PCI_ISA_IO_ADDR)
+/* The PCI_ISA_IO_ADDR, PCI_ISA_MEM_ADDR, and PCI_DRAM_OFFSET macros
+ * must be defined in the board-specific header file for targets that
+ * need them. Default values are defined here for targets that don't need
+ * them.
+ */
+#if defined(CONFIG_PCI)
+#if !defined(_IO_BASE)
#define _IO_BASE PCI_ISA_IO_ADDR
+#endif
+#if !defined(_ISA_MEM_BASE)
#define _ISA_MEM_BASE PCI_ISA_MEM_ADDR
-#define PCI_DRAM_OFFSET 0x80000000
-#else
-#define _IO_BASE 0
-#define _ISA_MEM_BASE 0
+#endif
+#if !defined(PCI_DRAM_OFFSET)
#define PCI_DRAM_OFFSET 0
#endif
-#else
-#if !defined(_IO_BASE) /* defined in board specific header */
+#else /* if defined(CONFIG_PCI) */
+#if !defined(_IO_BASE)
#define _IO_BASE 0
#endif
+#if !defined(_ISA_MEM_BASE)
#define _ISA_MEM_BASE 0
+#endif
+#if !defined(PCI_DRAM_OFFSET)
#define PCI_DRAM_OFFSET 0
#endif
+#endif /* if defined(CONFIG_PCI) */
#ifndef __ASSEMBLY__
extern unsigned long isa_io_base;
@@ -80,12 +82,8 @@
*/
extern unsigned char __res[];
-struct pt_regs;
-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 /* !__ASSEMBLY__ */
#endif /* CONFIG_8xx */
#endif /* __CONFIG_8xx_DEFS */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)