Merge branch 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl...

[linux-2.6] / include / linux / poison.h

diff --git a/include/linux/poison.h b/include/linux/poison.h
index a5347c02432e99eaa5b57ae5edeafa96c18152ee..3e628f990fdfd020d23d9e46163a8ea4f094ea78 100644 (file)
--- a/include/linux/poison.h
+++ b/include/linux/poison.h
@@ -44,6 +44,11 @@
 
 /********** drivers/atm/ **********/
 #define ATM_POISON_FREE                0x12
+#define ATM_POISON             0xdeadbeef
+
+/********** net/ **********/
+#define NEIGHBOR_DEAD          0xdeadbeef
+#define NETFILTER_LINK_POISON  0xdead57ac
 
 /********** kernel/mutexes **********/
 #define MUTEX_DEBUG_INIT       0x11