Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

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

diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h
index 4fa9508..fd2f9bf 100644 (file)
--- a/include/asm-arm/mach/arch.h
+++ b/include/asm-arm/mach/arch.h
@@ -16,11 +16,10 @@ struct sys_timer;
 
 struct machine_desc {
        /*
-        * Note! The first five elements are used
+        * Note! The first four elements are used
         * by assembler code in head-armv.S
         */
        unsigned int            nr;             /* architecture number  */
-       unsigned int            phys_ram;       /* start of physical ram */
        unsigned int            phys_io;        /* start of physical io */
        unsigned int            io_pg_offst;    /* byte offset for io 
                                                 * page tabe entry      */
@@ -48,10 +47,11 @@ struct machine_desc {
  * Set of macros to define architecture features.  This is built into
  * a table by the linker.
  */
-#define MACHINE_START(_type,_name)             \
-const struct machine_desc __mach_desc_##_type  \
+#define MACHINE_START(_type,_name)                     \
+static const struct machine_desc __mach_desc_##_type   \
+ __attribute_used__                                    \
  __attribute__((__section__(".arch.info.init"))) = {   \
-       .nr             = MACH_TYPE_##_type,    \
+       .nr             = MACH_TYPE_##_type,            \
        .name           = _name,
 
 #define MACHINE_END                            \