Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc

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

diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index b95386aed50d15bd1063ea39d228e189d6df1491..1233d735fd289a5831e7d6a542a0912b9cffcf32 100644 (file)
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -80,7 +80,8 @@ struct machdep_calls {
                                     long index,
                                     long npages,
                                     unsigned long uaddr,
-                                    enum dma_data_direction direction);
+                                    enum dma_data_direction direction,
+                                    struct dma_attrs *attrs);
        void            (*tce_free)(struct iommu_table *tbl,
                                    long index,
                                    long npages);
@@ -198,9 +199,6 @@ struct machdep_calls {
           May be NULL. */
        void            (*init)(void);
 
-       void            (*setup_io_mappings)(void);
-
-       void            (*early_serial_map)(void);
        void            (*kgdb_map_scc)(void);
 
        /*
@@ -265,6 +263,7 @@ struct machdep_calls {
 #endif
 };
 
+extern void e500_idle(void);
 extern void power4_idle(void);
 extern void power4_cpu_offline_powersave(void);
 extern void ppc6xx_idle(void);