Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / linux / poison.h

diff --git a/include/linux/poison.h b/include/linux/poison.h
index 9f31683728fd7e2c59f738ae35ab6835066270c1..03620dacba2d9d306ecc2ee576c8f28e36674434 100644 (file)
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -68,4 +68,10 @@
 /********** sound/oss/ **********/
 #define OSS_POISON_FREE                0xAB
 
+/*
+ * Used in arch/arm/plat-omap/sram.h to mark SRAM addresses that
+ * will be patched at runtime
+ */
+#define SRAM_VA_MAGIC          0xbadfeed1
+
 #endif