Pull platform-drivers into test branch

[linux-2.6-omap-h63xx.git] / drivers / net / irda / sa1100_ir.c

diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index 63d38fbbd04ecb59e6e42748d162af2c4968e4af..937372d00398af170db4c3c6371bb2ec6c61fb10 100644 (file)
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -18,7 +18,6 @@
  *     power_leve:level        - set the transmitter power level
  *     tx_lpm:0|1              - set transmit low power mode
  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
@@ -580,7 +579,7 @@ static void sa1100_irda_fir_irq(struct net_device *dev)
        sa1100_irda_rx_dma_start(si);
 }
 
-static irqreturn_t sa1100_irda_irq(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t sa1100_irda_irq(int irq, void *dev_id)
 {
        struct net_device *dev = dev_id;
        if (IS_FIR(((struct sa1100_irda *)dev->priv)))
@@ -695,8 +694,7 @@ static int sa1100_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)
                /*
                 * We must not be transmitting...
                 */
-               if (si->txskb)
-                       BUG();
+               BUG_ON(si->txskb);
 
                netif_stop_queue(dev);