From b006b3e67e11bd5bb2dbeca41babf0bb3456ba39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Fri, 25 Jul 2008 21:45:49 -0700
Subject: [PATCH] --- yaml --- r: 106327 b: refs/heads/master c:
 ec34c702ca8b7d6f0aa54379c3b0d0ec10b8ff23 h: refs/heads/master i:   106325:
 900234e0a17290cddd2260643ad85353dd075ddb   106323:
 cbc67a7ab6ecc5d179c7231bf4ee27eb3ef91d22   106319:
 3bb6b2d56175327ea979432a380c795fd3ce6f16 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/rtnetlink.h | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index d0354ef56635..729e7fed03a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 547b792cac0a038b9dbf958d3c120df3740b5572
+refs/heads/master: ec34c702ca8b7d6f0aa54379c3b0d0ec10b8ff23
diff --git a/trunk/include/linux/rtnetlink.h b/trunk/include/linux/rtnetlink.h
index f4d386c191f5..ca643b13b026 100644
--- a/trunk/include/linux/rtnetlink.h
+++ b/trunk/include/linux/rtnetlink.h
@@ -755,13 +755,6 @@ extern void __rtnl_unlock(void);
 	} \
 } while(0)
 
-#define BUG_TRAP(x) do { \
-	if (unlikely(!(x))) { \
-		printk(KERN_ERR "KERNEL: assertion (%s) failed at %s (%d)\n", \
-			#x,  __FILE__ , __LINE__); \
-	} \
-} while(0)
-
 static inline u32 rtm_get_table(struct rtattr **rta, u8 table)
 {
 	return RTA_GET_U32(rta[RTA_TABLE-1]);