linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h
index da77467..a3e8a45 100644 (file)
--- a/include/asm-ppc/machdep.h
+++ b/include/asm-ppc/machdep.h
@@ -2,6 +2,7 @@
 #ifndef _PPC_MACHDEP_H
 #define _PPC_MACHDEP_H
 
+#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/kexec.h>
 
@@ -18,18 +19,6 @@ 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
  */
@@ -55,7 +44,7 @@ struct machdep_calls {
        void            (*power_off)(void);
        void            (*halt)(void);
 
-       void            (*idle_loop)(void);
+       void            (*idle)(void);
        void            (*power_save)(void);
 
        long            (*time_init)(void); /* Optional, may be NULL */
@@ -115,6 +104,9 @@ struct machdep_calls {
                                                unsigned long size,
                                                pgprot_t vma_prot);
 
+       /* this is for modules, since _machine can be a define -- Cort */
+       int ppc_machine;
+
        /* Motherboard/chipset features. This is a kind of general purpose
         * hook used to control some machine specific features (like reset
         * lines, chip power control, etc...).