Merge omap-drivers

[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 42f00678b362f2b684b5ec610f41d7ed8ce7d999..da786171d15cbb827c99a702aaced46cf1ef2a88 100644 (file)
--- a/include/asm-arm/setup.h
+++ b/include/asm-arm/setup.h
@@ -197,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 }
 
@@ -230,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__  */