Merge with /home/shaggy/git/linus-clean/

[linux-2.6-omap-h63xx.git] / include / asm-arm / mach / arch.h

diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h
index 7273c6fd95b53d39a3bae2e882c134e789030fcb..2cd57b4d64d9f4d0a70f340d1110bc03439a6426 100644 (file)
--- a/include/asm-arm/mach/arch.h
+++ b/include/asm-arm/mach/arch.h
@@ -10,6 +10,8 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/compiler.h>
+
 struct tag;
 struct meminfo;
 struct sys_timer;
@@ -20,7 +22,7 @@ struct machine_desc {
         * by assembler code in head-armv.S
         */
        unsigned int            nr;             /* architecture number  */
-       unsigned int            phys_ram;       /* start of physical ram */
+       unsigned int __deprecated 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      */
@@ -50,6 +52,7 @@ struct machine_desc {
  */
 #define MACHINE_START(_type,_name)                     \
 static const struct machine_desc __mach_desc_##_type   \
+ __attribute_used__                                    \
  __attribute__((__section__(".arch.info.init"))) = {   \
        .nr             = MACH_TYPE_##_type,            \
        .name           = _name,