Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/setup.h b/include/asm-arm/setup.h
index e5407392afcad0413c0df46030f51e2c93c4fd5b..da786171d15cbb827c99a702aaced46cf1ef2a88 100644 (file)
--- a/include/asm-arm/setup.h
+++ b/include/asm-arm/setup.h
@@ -136,6 +136,13 @@ struct tag_acorn {
        __u8 adfsdrives;
 };
 
+/* TI OMAP specific information */
+#define ATAG_BOARD       0x414f4d50
+
+struct tag_omap {
+       u8 data[0];
+};
+
 /* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */
 #define ATAG_MEMCLK    0x41000402
 
@@ -161,6 +168,11 @@ struct tag {
                 */
                struct tag_acorn        acorn;
 
+               /*
+                * OMAP specific
+                 */
+                struct tag_omap         omap;
+
                /*
                 * DC21285 specific
                 */
@@ -185,7 +197,7 @@ struct tagtable {
 
 #ifdef __KERNEL__
 
-#define __tag __attribute_used__ __attribute__((__section__(".taglist.init")))
+#define __tag __used __attribute__((__section__(".taglist.init")))
 #define __tagtable(tag, fn) \
 static struct tagtable __tagtable_##fn __tag = { tag, fn }
 
@@ -218,7 +230,7 @@ struct early_params {
 };
 
 #define __early_param(name,fn)                                 \
-static struct early_params __early_##fn __attribute_used__     \
+static struct early_params __early_##fn __used                 \
 __attribute__((__section__(".early_param.init"))) = { name, fn }
 
 #endif  /*  __KERNEL__  */