projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/~dhowells/irq-2.6
[powerpc.git]
/
drivers
/
net
/
saa9730.c
diff --git
a/drivers/net/saa9730.c
b/drivers/net/saa9730.c
index
b2acedb
..
c9efad8
100644
(file)
--- a/
drivers/net/saa9730.c
+++ b/
drivers/net/saa9730.c
@@
-745,8
+745,7
@@
static int lan_saa9730_rx(struct net_device *dev)
return 0;
}
return 0;
}
-static irqreturn_t lan_saa9730_interrupt(const int irq, void *dev_id,
- struct pt_regs *regs)
+static irqreturn_t lan_saa9730_interrupt(const int irq, void *dev_id)
{
struct net_device *dev = (struct net_device *) dev_id;
struct lan_saa9730_private *lp = netdev_priv(dev);
{
struct net_device *dev = (struct net_device *) dev_id;
struct lan_saa9730_private *lp = netdev_priv(dev);
@@
-1131,7
+1130,7
@@
static struct pci_driver saa9730_driver = {
static int __init saa9730_init(void)
{
static int __init saa9730_init(void)
{
- return pci_
module_init
(&saa9730_driver);
+ return pci_
register_driver
(&saa9730_driver);
}
static void __exit saa9730_cleanup(void)
}
static void __exit saa9730_cleanup(void)