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/input/misc/ixp4xx-beeper.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/input/misc/ixp4xx-beeper.c')
| -rw-r--r-- | drivers/input/misc/ixp4xx-beeper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c index 805b636e73d9..105c6fc27823 100644 --- a/drivers/input/misc/ixp4xx-beeper.c +++ b/drivers/input/misc/ixp4xx-beeper.c | |||
| @@ -79,7 +79,7 @@ static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned | |||
| 79 | return 0; | 79 | return 0; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | static irqreturn_t ixp4xx_spkr_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 82 | static irqreturn_t ixp4xx_spkr_interrupt(int irq, void *dev_id) |
| 83 | { | 83 | { |
| 84 | /* clear interrupt */ | 84 | /* clear interrupt */ |
| 85 | *IXP4XX_OSST = IXP4XX_OSST_TIMER_2_PEND; | 85 | *IXP4XX_OSST = IXP4XX_OSST_TIMER_2_PEND; |