Merge with /home/tmlind/src/kernel/linux-2.6

[pandora-kernel.git] / include / asm-arm / setup.h

diff --git a/include/asm-arm/setup.h b/include/asm-arm/setup.h
index e540739..42f0067 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
                 */