Merge branches 'release', 'bugzilla-8570', 'bugzilla-9966', 'bugzilla-9998', 'bugzill...

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

diff --git a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h
index e1a0a7b213d7bdbc313cf043572e1983f0304b3a..a20b499b0186c6606aa8be36f5a182314c5ed0ae 100644 (file)
--- a/include/asm-ppc/machdep.h
+++ b/include/asm-ppc/machdep.h
@@ -2,17 +2,12 @@
 #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;
@@ -44,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 ! */