PCI: X86: Introduce and enable PCI domain support

[linux-2.6] / include / asm-ppc / machdep.h

diff --git a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h
index 2723b423f6757be06a7fbf55c5612fc52926142a..a20b499b0186c6606aa8be36f5a182314c5ed0ae 100644 (file)
--- a/include/asm-ppc/machdep.h
+++ b/include/asm-ppc/machdep.h
@@ -2,23 +2,30 @@
 #ifndef _PPC_MACHDEP_H
 #define _PPC_MACHDEP_H
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/kexec.h>
 
 #include <asm/setup.h>
 #include <asm/page.h>
 
-#ifdef CONFIG_APUS
-#include <asm-m68k/machdep.h>
-#endif
-
 struct pt_regs;
 struct pci_bus;        
 struct pci_dev;
 struct seq_file;
 struct file;
 
+/*
+ * This is for compatibility with ARCH=powerpc.
+ */
+#define machine_is(x)  __MACHINE_IS_##x
+#define __MACHINE_IS_powermac  0
+#define __MACHINE_IS_chrp      0
+#ifdef CONFIG_PPC_PREP
+#define __MACHINE_IS_prep      1
+#else
+#define __MACHINE_IS_prep      0
+#endif
+
 /* We export this macro for external modules like Alsa to know if
  * ppc_md.feature_call is implemented or not
  */
@@ -32,7 +39,7 @@ struct machdep_calls {
        /* Optional, may be NULL. */
        unsigned int    (*irq_canonicalize)(unsigned int irq);
        void            (*init_IRQ)(void);
-       int             (*get_irq)(struct pt_regs *);
+       int             (*get_irq)(void);
        
        /* A general init function, called by ppc_init in init/main.c.
           May be NULL. DEPRECATED ! */