linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / tulip / xircom_cb.c

diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 5634410..60d1e05 100644 (file)
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -32,9 +32,6 @@
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#ifdef CONFIG_NET_POLL_CONTROLLER
-#include <asm/irq.h>
-#endif
 
 #ifdef DEBUG
 #define enter(x)   printk("Enter: %s, %s line %i\n",x,__FILE__,__LINE__)
@@ -601,8 +598,10 @@ static void setup_descriptors(struct xircom_private *card)
        enter("setup_descriptors");
 
 
-       BUG_ON(card->rx_buffer == NULL);
-       BUG_ON(card->tx_buffer == NULL);
+       if (card->rx_buffer == NULL)
+               BUG();
+       if (card->tx_buffer == NULL)
+               BUG();
 
        /* Receive descriptors */
        memset(card->rx_buffer, 0, 128);        /* clear the descriptors */