X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fns83820.c;h=deedd7b2af5d372bc6c581a5b68daa5b56e0e862;hb=93fdf10d4c28edaa1b9f80e7f9c3002359186d00;hp=8e9b1a537deeaca0dedf55337c5626cc0d55c556;hpb=c0e4077c946104e5d8a62f835dcdca5c79c8af7d;p=linux-2.6

diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 8e9b1a537d..deedd7b2af 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -96,7 +96,6 @@
 //#define dprintk		printk
 #define dprintk(x...)		do { } while (0)
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
@@ -568,8 +567,7 @@ static inline int ns83820_add_rx_skb(struct ns83820 *dev, struct sk_buff *skb)
 #endif
 
 	sg = dev->rx_info.descs + (next_empty * DESC_SIZE);
-	if (unlikely(NULL != dev->rx_info.skbs[next_empty]))
-		BUG();
+	BUG_ON(NULL != dev->rx_info.skbs[next_empty]);
 	dev->rx_info.skbs[next_empty] = skb;
 
 	dev->rx_info.next_empty = (next_empty + 1) % NR_RX_DESC;