diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-02-03 17:49:49 -0500 |
|---|---|---|
| committer | Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> | 2006-02-03 17:49:49 -0500 |
| commit | 01d206a7c1167639f6ca6dac22140fbdca017558 (patch) | |
| tree | bc3ccf1a8140a7f787c4728cfa4c30e65ad56eb2 /arch/um/drivers/line.c | |
| parent | 9c4b562abc9005e4b413de02c85d3d29da707cba (diff) | |
| parent | d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (diff) | |
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/um/drivers/line.c')
| -rw-r--r-- | arch/um/drivers/line.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 46ceb25a9959..6c2d4ccaf20f 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c | |||
| @@ -714,7 +714,7 @@ struct winch { | |||
| 714 | struct tty_struct *tty; | 714 | struct tty_struct *tty; |
| 715 | }; | 715 | }; |
| 716 | 716 | ||
| 717 | irqreturn_t winch_interrupt(int irq, void *data, struct pt_regs *unused) | 717 | static irqreturn_t winch_interrupt(int irq, void *data, struct pt_regs *unused) |
| 718 | { | 718 | { |
| 719 | struct winch *winch = data; | 719 | struct winch *winch = data; |
| 720 | struct tty_struct *tty; | 720 | struct tty_struct *tty; |