diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
| commit | f0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch) | |
| tree | 2472e94d39f43a9580a6d2d5d92de0b749023263 /drivers/char/applicom.c | |
| parent | 0cfea5dd98205f2fa318836da664a7d7df1afbc1 (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Diffstat (limited to 'drivers/char/applicom.c')
| -rw-r--r-- | drivers/char/applicom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c index 10a389dafd60..1f0b752e5de1 100644 --- a/drivers/char/applicom.c +++ b/drivers/char/applicom.c | |||
| @@ -110,7 +110,7 @@ static ssize_t ac_read (struct file *, char __user *, size_t, loff_t *); | |||
| 110 | static ssize_t ac_write (struct file *, const char __user *, size_t, loff_t *); | 110 | static ssize_t ac_write (struct file *, const char __user *, size_t, loff_t *); |
| 111 | static int ac_ioctl(struct inode *, struct file *, unsigned int, | 111 | static int ac_ioctl(struct inode *, struct file *, unsigned int, |
| 112 | unsigned long); | 112 | unsigned long); |
| 113 | static irqreturn_t ac_interrupt(int, void *, struct pt_regs *); | 113 | static irqreturn_t ac_interrupt(int, void *); |
| 114 | 114 | ||
| 115 | static const struct file_operations ac_fops = { | 115 | static const struct file_operations ac_fops = { |
| 116 | .owner = THIS_MODULE, | 116 | .owner = THIS_MODULE, |
| @@ -617,7 +617,7 @@ static ssize_t ac_read (struct file *filp, char __user *buf, size_t count, loff_ | |||
| 617 | } | 617 | } |
| 618 | } | 618 | } |
| 619 | 619 | ||
| 620 | static irqreturn_t ac_interrupt(int vec, void *dev_instance, struct pt_regs *regs) | 620 | static irqreturn_t ac_interrupt(int vec, void *dev_instance) |
| 621 | { | 621 | { |
| 622 | unsigned int i; | 622 | unsigned int i; |
| 623 | unsigned int FlagInt; | 623 | unsigned int FlagInt; |