git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
irda
/
sa1100_ir.c
diff --git
a/drivers/net/irda/sa1100_ir.c
b/drivers/net/irda/sa1100_ir.c
index
f530686
..
937372d
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
*/
* 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>
#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);
}
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)))
{
struct net_device *dev = dev_id;
if (IS_FIR(((struct sa1100_irda *)dev->priv)))