diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/net/arm/am79c961a.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/net/arm/am79c961a.c')
| -rw-r--r-- | drivers/net/arm/am79c961a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c index 09d5c3f26985..ddd12d44ff22 100644 --- a/drivers/net/arm/am79c961a.c +++ b/drivers/net/arm/am79c961a.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | #include "am79c961a.h" | 38 | #include "am79c961a.h" |
| 39 | 39 | ||
| 40 | static irqreturn_t | 40 | static irqreturn_t |
| 41 | am79c961_interrupt (int irq, void *dev_id, struct pt_regs *regs); | 41 | am79c961_interrupt (int irq, void *dev_id); |
| 42 | 42 | ||
| 43 | static unsigned int net_debug = NET_DEBUG; | 43 | static unsigned int net_debug = NET_DEBUG; |
| 44 | 44 | ||
| @@ -596,7 +596,7 @@ am79c961_tx(struct net_device *dev, struct dev_priv *priv) | |||
| 596 | } | 596 | } |
| 597 | 597 | ||
| 598 | static irqreturn_t | 598 | static irqreturn_t |
| 599 | am79c961_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 599 | am79c961_interrupt(int irq, void *dev_id) |
| 600 | { | 600 | { |
| 601 | struct net_device *dev = (struct net_device *)dev_id; | 601 | struct net_device *dev = (struct net_device *)dev_id; |
| 602 | struct dev_priv *priv = netdev_priv(dev); | 602 | struct dev_priv *priv = netdev_priv(dev); |