diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/char/sonypi.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/char/sonypi.c')
| -rw-r--r-- | drivers/char/sonypi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index d4e434d694b7..c084149153de 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c | |||
| @@ -826,7 +826,7 @@ static void sonypi_report_input_event(u8 event) | |||
| 826 | } | 826 | } |
| 827 | 827 | ||
| 828 | /* Interrupt handler: some event is available */ | 828 | /* Interrupt handler: some event is available */ |
| 829 | static irqreturn_t sonypi_irq(int irq, void *dev_id, struct pt_regs *regs) | 829 | static irqreturn_t sonypi_irq(int irq, void *dev_id) |
| 830 | { | 830 | { |
| 831 | u8 v1, v2, event = 0; | 831 | u8 v1, v2, event = 0; |
| 832 | int i, j; | 832 | int i, j; |