diff --git a/[refs] b/[refs]
index f5855cd5e8f4..61d15dad1115 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f46b1343f723f98634a5dcee47856b2000079ed
+refs/heads/master: d48e470f76887d0befe025049158aeb6c1219d71
diff --git a/trunk/net/wimax/id-table.c b/trunk/net/wimax/id-table.c
index d3b88558682c..5e685f7eda90 100644
--- a/trunk/net/wimax/id-table.c
+++ b/trunk/net/wimax/id-table.c
@@ -123,15 +123,17 @@ void wimax_id_table_rm(struct wimax_dev *wimax_dev)
 /*
  * Release the gennetlink family id / mapping table
  *
- * On debug, verify that the table is empty upon removal.
+ * On debug, verify that the table is empty upon removal. We want the
+ * code always compiled, to ensure it doesn't bit rot. It will be
+ * compiled out if CONFIG_BUG is disabled.
  */
 void wimax_id_table_release(void)
 {
+	struct wimax_dev *wimax_dev;
+
 #ifndef CONFIG_BUG
 	return;
 #endif
-	struct wimax_dev *wimax_dev;
-
 	spin_lock(&wimax_id_table_lock);
 	list_for_each_entry(wimax_dev, &wimax_id_table, id_table_node) {
 		printk(KERN_ERR "BUG: %s wimax_dev %p ifindex %d not cleared\n",