Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next

[uclinux-h8/linux.git] / arch / arm / include / asm / mach / arch.h

diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 5249cc3..060a75e 100644 (file)
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -14,7 +14,6 @@
 #include <linux/reboot.h>
 
 struct tag;
-struct meminfo;
 struct pt_regs;
 struct smp_operations;
 #ifdef CONFIG_SMP
@@ -50,8 +49,7 @@ struct machine_desc {
        void                    (*l2c_write_sec)(unsigned long, unsigned);
        struct smp_operations   *smp;           /* SMP operations       */
        bool                    (*smp_init)(void);
-       void                    (*fixup)(struct tag *, char **,
-                                        struct meminfo *);
+       void                    (*fixup)(struct tag *, char **);
        void                    (*init_meminfo)(void);
        void                    (*reserve)(void);/* reserve mem blocks  */
        void                    (*map_io)(void);/* IO mapping function  */