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/ppdev.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/char/ppdev.c')
| -rw-r--r-- | drivers/char/ppdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index 520d2cf82bc0..efc485edad1c 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c | |||
| @@ -269,7 +269,7 @@ static ssize_t pp_write (struct file * file, const char __user * buf, | |||
| 269 | return bytes_written; | 269 | return bytes_written; |
| 270 | } | 270 | } |
| 271 | 271 | ||
| 272 | static void pp_irq (int irq, void * private, struct pt_regs * unused) | 272 | static void pp_irq (int irq, void * private) |
| 273 | { | 273 | { |
| 274 | struct pp_struct * pp = (struct pp_struct *) private; | 274 | struct pp_struct * pp = (struct pp_struct *) private; |
| 275 | 275 | ||