diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/net/wireless/ipw2100.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/wireless/ipw2100.c')
| -rw-r--r-- | drivers/net/wireless/ipw2100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index 599e2fe76188..4e4eaa2a99ca 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c | |||
| @@ -3255,7 +3255,7 @@ static void ipw2100_irq_tasklet(struct ipw2100_priv *priv) | |||
| 3255 | IPW_DEBUG_ISR("exit\n"); | 3255 | IPW_DEBUG_ISR("exit\n"); |
| 3256 | } | 3256 | } |
| 3257 | 3257 | ||
| 3258 | static irqreturn_t ipw2100_interrupt(int irq, void *data, struct pt_regs *regs) | 3258 | static irqreturn_t ipw2100_interrupt(int irq, void *data) |
| 3259 | { | 3259 | { |
| 3260 | struct ipw2100_priv *priv = data; | 3260 | struct ipw2100_priv *priv = data; |
| 3261 | u32 inta, inta_mask; | 3261 | u32 inta, inta_mask; |