Merge branch 'e1000' of ssh://198.78.49.142/srv/git/intel/linux-2.6

[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 1d4ab70a56f353eed0e22d06d3241983d9559d42..a3e8a45e45a9e40b34496c57144c6427ed391563 100644 (file)
--- a/include/asm-ppc/machdep.h
+++ b/include/asm-ppc/machdep.h
@@ -35,8 +35,10 @@ struct machdep_calls {
        int             (*get_irq)(struct pt_regs *);
        
        /* A general init function, called by ppc_init in init/main.c.
-          May be NULL. */
+          May be NULL. DEPRECATED ! */
        void            (*init)(void);
+       /* For compatibility with merged platforms */
+       void            (*init_early)(void);
 
        void            (*restart)(char *cmd);
        void            (*power_off)(void);
@@ -98,7 +100,7 @@ struct machdep_calls {
 
        /* Get access protection for /dev/mem */
        pgprot_t        (*phys_mem_access_prot)(struct file *file,
-                                               unsigned long offset,
+                                               unsigned long pfn,
                                                unsigned long size,
                                                pgprot_t vma_prot);
 
@@ -152,22 +154,9 @@ extern char cmd_line[COMMAND_LINE_SIZE];
 
 extern void setup_pci_ptrs(void);
 
-/*
- * Power macintoshes have either a CUDA or a PMU controlling
- * system reset, power, NVRAM, RTC.
- */
-typedef enum sys_ctrler_kind {
-       SYS_CTRLER_UNKNOWN = 0,
-       SYS_CTRLER_CUDA = 1,
-       SYS_CTRLER_PMU = 2,
-       SYS_CTRLER_SMU = 3,
-} sys_ctrler_t;
-
-extern sys_ctrler_t sys_ctrler;
-
 #ifdef CONFIG_SMP
 struct smp_ops_t {
-       void  (*message_pass)(int target, int msg, unsigned long data, int wait);
+       void  (*message_pass)(int target, int msg);
        int   (*probe)(void);
        void  (*kick_cpu)(int nr);
        void  (*setup_cpu)(int nr);