Merge commit 'origin/master' into next

[pandora-kernel.git] / drivers / net / ixgb / ixgb_osdep.h

diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ixgb/ixgb_osdep.h
index d92e72b..371a6be 100644 (file)
--- a/drivers/net/ixgb/ixgb_osdep.h
+++ b/drivers/net/ixgb/ixgb_osdep.h
@@ -40,7 +40,7 @@
 #include <linux/sched.h>
 
 #undef ASSERT
-#define ASSERT(x)      if (!(x)) BUG()
+#define ASSERT(x)      BUG_ON(!(x))
 #define MSGOUT(S, A, B)        printk(KERN_DEBUG S "\n", A, B)
 
 #ifdef DBG